Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 51427: [SERVICES] Lock the service database in order to protect it from concurrent access.
by ekohl＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: ekohl Date: Fri Apr 22 14:09:21 2011 New Revision: 51427 URL: http://svn.reactos.org/svn/reactos?rev=51427&view=rev Log: [SERVICES] Lock the service database in order to protect it from concurrent access. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Apr 22 14:09:21 2011 @@ -455,12 +455,17 @@ HeapFree(GetProcessHeap(), 0, hManager); hManager = NULL; + *hSCObject = NULL; + DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; } else if (hService != NULL) { DPRINT("Found service handle\n"); + + /* Lock the service database exlusively */ + ScmLockDatabaseExclusive(); /* Get the pointer to the service record */ lpService = hService->ServiceEntry; @@ -491,6 +496,7 @@ if (dwError != ERROR_SUCCESS) { DPRINT("Failed to open services key\n"); + ScmUnlockDatabase(); return dwError; } @@ -507,6 +513,7 @@ { DPRINT("Deletion failed due to running dependencies.\n"); RegCloseKey(hServicesKey); + ScmUnlockDatabase(); return ERROR_SUCCESS; } @@ -522,6 +529,7 @@ if (dwError != ERROR_SUCCESS) { DPRINT("Failed to Delete the Service Registry key\n"); + ScmUnlockDatabase(); return dwError; } @@ -529,6 +537,10 @@ ScmDeleteServiceRecord(lpService); } } + + ScmUnlockDatabase(); + + *hSCObject = NULL; DPRINT("RCloseServiceHandle() done\n"); return ERROR_SUCCESS; @@ -755,12 +767,14 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Acquire service database lock exclusively */ + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); if (lpService->bDeleted) { DPRINT("The service has already been marked for delete!\n"); - return ERROR_SERVICE_MARKED_FOR_DELETE; + dwError = ERROR_SERVICE_MARKED_FOR_DELETE; + goto Done; } /* Mark service for delete */ @@ -768,7 +782,9 @@ dwError = ScmMarkServiceForDelete(lpService); - /* FIXME: Release service database lock */ +Done:; + /* Unlock the service database */ + ScmUnlockDatabase(); DPRINT("RDeleteService() done\n"); @@ -1047,6 +1063,7 @@ return ERROR_INVALID_HANDLE; } + /* Lock the srevice database shared */ ScmLockDatabaseShared(); /* Return service status information */ @@ -1054,6 +1071,7 @@ &lpService->Status, sizeof(SERVICE_STATUS)); + /* Unlock the service database */ ScmUnlockDatabase(); return ERROR_SUCCESS; @@ -1132,12 +1150,14 @@ return ERROR_INVALID_DATA; } + /* Lock the service database exclusively */ ScmLockDatabaseExclusive(); RtlCopyMemory(&lpService->Status, lpServiceStatus, sizeof(SERVICE_STATUS)); + /* Unlock the service database */ ScmUnlockDatabase(); DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); @@ -1233,13 +1253,14 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock database exclusively */ + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); if (lpService->bDeleted) { - /* FIXME: Unlock database */ DPRINT("The service has already been marked for delete!\n"); - return ERROR_SERVICE_MARKED_FOR_DELETE; + dwError = ERROR_SERVICE_MARKED_FOR_DELETE; + goto done; } /* Open the service key */ @@ -1406,11 +1427,12 @@ /* FIXME: Write password */ } - /* FIXME: Unlock database */ - done: if (hServiceKey != NULL) RegCloseKey(hServiceKey); + + /* Unlock the service database */ + ScmUnlockDatabase(); DPRINT("RChangeServiceConfigW() done (Error %lu)\n", dwError); @@ -2326,7 +2348,8 @@ if (lpResumeHandle) dwLastResumeCount = *lpResumeHandle; - /* FIXME: Lock the service list shared */ + /* Lock the service database shared */ + ScmLockDatabaseShared(); lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); if (lpService == NULL) @@ -2464,7 +2487,8 @@ } Done:; - /* FIXME: Unlock the service list */ + /* Unlock the service database */ + ScmUnlockDatabase(); DPRINT("REnumServicesStatusW() done (Error %lu)\n", dwError); @@ -2532,7 +2556,7 @@ PSERVICE lpService; PMANAGER_HANDLE hManager; SC_HANDLE hHandle; - DWORD dwError; + DWORD dwError = ERROR_SUCCESS; DPRINT("ROpenServiceW() called\n"); DPRINT("hSCManager = %p\n", hSCManager); @@ -2556,14 +2580,16 @@ if (!lpServiceName) return ERROR_INVALID_ADDRESS; - /* FIXME: Lock the service list */ + /* Lock the service database exclusive */ + ScmLockDatabaseExclusive(); /* Get service database entry */ lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { DPRINT("Could not find a service!\n"); - return ERROR_SERVICE_DOES_NOT_EXIST; + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + goto Done; } /* Create a service handle */ @@ -2572,7 +2598,7 @@ if (dwError != ERROR_SUCCESS) { DPRINT("ScmCreateServiceHandle() failed (Error %lu)\n", dwError); - return dwError; + goto Done; } /* Check the desired access */ @@ -2582,7 +2608,7 @@ { DPRINT("ScmCheckAccess() failed (Error %lu)\n", dwError); HeapFree(GetProcessHeap(), 0, hHandle); - return dwError; + goto Done; } lpService->dwRefCount++; @@ -2591,9 +2617,13 @@ *lpServiceHandle = (SC_RPC_HANDLE)hHandle; DPRINT("*hService = %p\n", *lpServiceHandle); +Done:; + /* Unlock the service database */ + ScmUnlockDatabase(); + DPRINT("ROpenServiceW() done\n"); - return ERROR_SUCCESS; + return dwError; } @@ -2644,7 +2674,8 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock the service database shared */ + /* Lock the service database shared */ + ScmLockDatabaseShared(); dwError = ScmOpenServiceKey(lpService->lpServiceName, KEY_READ, @@ -2784,6 +2815,9 @@ *pcbBytesNeeded = dwRequiredSize; Done:; + /* Unlock the service database */ + ScmUnlockDatabase(); + if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); @@ -2795,8 +2829,6 @@ if (hServiceKey != NULL) RegCloseKey(hServiceKey); - - /* FIXME: Unlock the service database */ DPRINT("RQueryServiceConfigW() done\n"); @@ -3078,13 +3110,14 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock database exclusively */ + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); if (lpService->bDeleted) { - /* FIXME: Unlock database */ DPRINT("The service has already been marked for delete!\n"); - return ERROR_SERVICE_MARKED_FOR_DELETE; + dwError = ERROR_SERVICE_MARKED_FOR_DELETE; + goto done; } /* Open the service key */ @@ -3299,9 +3332,10 @@ /* FIXME: Write password */ } - /* FIXME: Unlock database */ - done: + /* Unlock the service database */ + ScmUnlockDatabase(); + if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -3822,7 +3856,8 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock the service database shared */ + /* Lock the service database shared */ + ScmLockDatabaseShared(); dwError = ScmOpenServiceKey(lpService->lpServiceName, KEY_READ, @@ -3995,6 +4030,9 @@ *pcbBytesNeeded = dwRequiredSize; Done:; + /* Unlock the service database */ + ScmUnlockDatabase(); + if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); @@ -4006,8 +4044,6 @@ if (hServiceKey != NULL) RegCloseKey(hServiceKey); - - /* FIXME: Unlock the service database */ DPRINT("RQueryServiceConfigA() done\n"); @@ -4444,13 +4480,14 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock database exclusively */ + /* Lock the service database exclusively */ + ScmLockDatabaseExclusive(); if (lpService->bDeleted) { - /* FIXME: Unlock database */ DPRINT("The service has already been marked for delete!\n"); - return ERROR_SERVICE_MARKED_FOR_DELETE; + dwError = ERROR_SERVICE_MARKED_FOR_DELETE; + goto done; } /* Open the service key */ @@ -4490,7 +4527,9 @@ } done: - /* FIXME: Unlock database */ + /* Unlock the service database */ + ScmUnlockDatabase(); + if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -4545,7 +4584,8 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock the service database shared */ + /* Lock the service database shared */ + ScmLockDatabaseShared(); dwError = ScmOpenServiceKey(lpService->lpServiceName, KEY_READ, @@ -4603,13 +4643,14 @@ } done: + /* Unlock the service database */ + ScmUnlockDatabase(); + if (lpDescription != NULL) HeapFree(GetProcessHeap(), 0, lpDescription); if (hServiceKey != NULL) RegCloseKey(hServiceKey); - - /* FIXME: Unlock database */ DPRINT("RQueryServiceConfig2W() done (Error %lu)\n", dwError); @@ -4663,7 +4704,8 @@ return ERROR_INVALID_HANDLE; } - /* FIXME: Lock the service database shared */ + /* Lock the service database shared */ + ScmLockDatabaseShared(); dwError = ScmOpenServiceKey(lpService->lpServiceName, KEY_READ, @@ -4759,6 +4801,9 @@ } done: + /* Unlock the service database */ + ScmUnlockDatabase(); + if (lpDescription != NULL) HeapFree(GetProcessHeap(), 0, lpDescription); @@ -4770,8 +4815,6 @@ if (hServiceKey != NULL) RegCloseKey(hServiceKey); - - /* FIXME: Unlock database */ DPRINT("RQueryServiceConfig2W() done (Error %lu)\n", dwError); @@ -4825,6 +4868,9 @@ return ERROR_INVALID_HANDLE; } + /* Lock the service database shared */ + ScmLockDatabaseShared(); + lpStatus = (LPSERVICE_STATUS_PROCESS)lpBuffer; /* Return service status information */ @@ -4834,6 +4880,9 @@ lpStatus->dwProcessId = lpService->ProcessId; /* FIXME */ lpStatus->dwServiceFlags = 0; /* FIXME */ + + /* Unlock the service database */ + ScmUnlockDatabase(); return ERROR_SUCCESS; } @@ -5028,9 +5077,10 @@ return ERROR_ACCESS_DENIED; } - if (lpResumeIndex) dwLastResumeCount = *lpResumeIndex; - - /* Lock the service list shared */ + if (lpResumeIndex) + dwLastResumeCount = *lpResumeIndex; + + /* FIXME: Lock the service list shared */ lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); if (lpService == NULL) @@ -5232,7 +5282,7 @@ } Done:; - /* Unlock the service list */ + /* FIXME: Unlock the service list */ DPRINT("REnumServicesStatusExW() done (Error %lu)\n", dwError);

1 0

[akhaldi] 51426: [Translations] * explorer-new: Fix some wrong UK and RU translations. * shell32: Update UK and RU translations. * Patch by Igor Paliychuk <mansonigor at gmail dot com>
by akhaldi＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: akhaldi Date: Fri Apr 22 14:07:22 2011 New Revision: 51426 URL: http://svn.reactos.org/svn/reactos?rev=51426&view=rev Log: [Translations] * explorer-new: Fix some wrong UK and RU translations. * shell32: Update UK and RU translations. * Patch by Igor Paliychuk <mansonigor at gmail dot com> Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Fri Apr 22 14:07:22 2011 @@ -7,7 +7,7 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Ïàíåëü çàäà÷", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Äèñïåò÷åð çàäà÷", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "&Çàêðåïèòü ïàíåëü çàäà÷", ID_LOCKTASKBAR MENUITEM "&Ñâîéñòâà", ID_SHELL_CMD_PROPERTIES Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Fri Apr 22 14:07:22 2011 @@ -13,7 +13,7 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "Ïàíåëü çàâäàíü", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Äèñïåò÷åð çàâäàíü", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "&Çàêð³ïèòè ïàíåëü çàâäàíü", ID_LOCKTASKBAR MENUITEM "Â&ëàñòèâîñò³", ID_SHELL_CMD_PROPERTIES Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Apr 22 14:07:22 2011 @@ -668,10 +668,10 @@ IDS_LOGOFF_PROMPT "Do you want to log off?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Íåâîçìîæíî îòîáðàçèòü Äèàëîã Âûïîëíèòü Ôàéë (âíóòðåííÿÿ îøèáêà)" + IDS_RUNDLG_BROWSE_ERROR "Íåâîçìîæíî îòîáðàçèòü Äèàëîã Îáçîð (âíóòðåííÿÿ îøèáêà)" + IDS_RUNDLG_BROWSE_CAPTION "Îáçîð" + IDS_RUNDLG_BROWSE_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0Âñå ôàéëû (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" @@ -722,8 +722,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" IDS_EMPTY_BITBUCKET "Î÷èñòèòü êîðçèíó" IDS_PICK_ICON_TITLE "Âûáðàòü çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Âñå ôàéëû (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0Âñå ôàéëû (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð âèðòóàëüíîãî óñòðîéñòâà" IDS_BAT_FILE "Ïàêåòíûé ôàéë ReactOS" @@ -742,7 +742,7 @@ IDS_SYS_FILE "Ñèñòåìíûé ôàéë" IDS_OPEN_VERB "Îòêðûòü" - IDS_EXPLORE_VERB "Explore" + IDS_EXPLORE_VERB "Îòêðûòü â äåðåâå" IDS_RUNAS_VERB "Çàïóñòèòü êàê " IDS_EDIT_VERB "Èçìåíèòü" IDS_FIND_VERB "Ïîèñê" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Apr 22 14:07:22 2011 @@ -682,10 +682,10 @@ IDS_LOGOFF_PROMPT "Âè õî÷åòå âèéòè ç ñèñòåìè?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Íåìîæëèâî â³äîáðàçèòè Ä³àëîã Çàïóñêó Ôàéëó (âíóòð³øíÿ ïîìèëêà)" + IDS_RUNDLG_BROWSE_ERROR "Íåìîæëèâî â³äîáðàçèòè Ä³àëîã Îãëÿäó (âíóòð³øíÿ ïîìèëêà)" + IDS_RUNDLG_BROWSE_CAPTION "Îãëÿä" + IDS_RUNDLG_BROWSE_FILTER "Âèêîíóâàí³ Ôàéëè (*.exe)\0*.exe\0Âñ³ Ôàéëè (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -736,8 +736,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíèé ïðîñò³ð" IDS_EMPTY_BITBUCKET "Î÷èñòèòè Êîøèê" IDS_PICK_ICON_TITLE "Âèáðàòè çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Âñ³ Ôàéëè (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0Âñ³ Ôàéëè (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð â³ðòóàëüíîãî ïðèñòðîþ" IDS_BAT_FILE "Ïàêåòíèé ôàéë ReactOS" @@ -756,7 +756,7 @@ IDS_SYS_FILE "Ñèñòåìíèé ôàéë" IDS_OPEN_VERB "Â³äêðèòè" - IDS_EXPLORE_VERB "Explore" + IDS_EXPLORE_VERB "Â³äêðèòè â äåðåâ³" IDS_RUNAS_VERB "Çàïóñòèòè ÿê " IDS_EDIT_VERB "Çì³íèòè" IDS_FIND_VERB "Ïîøóê"

1 0

[rharabien] 51425: [KERNEL32] * Add Traditional, Hongkong and Macau Chinese NLS removed in 48530. Fixes msvcrt:locale cmake branch regression.
by rharabien＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: rharabien Date: Fri Apr 22 12:47:36 2011 New Revision: 51425 URL: http://svn.reactos.org/svn/reactos?rev=51425&view=rev Log: [KERNEL32] * Add Traditional, Hongkong and Macau Chinese NLS removed in 48530. Fixes msvcrt:locale cmake branch regression. Modified: branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc Modified: branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc [iso-8859-1] Fri Apr 22 12:47:36 2011 @@ -48,11 +48,11 @@ #include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */ -//#include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ +#include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */ #include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */ -//#include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */ +#include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */ #include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */ -//#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ +#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */ #include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */ @@ -119,7 +119,7 @@ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ +#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */ #include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */

1 0

[ilardig] 51424: [shimgvw] Add Italian translation. [mplay32] Fix Italian translation for play.
by ilardig＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: ilardig Date: Fri Apr 22 12:30:50 2011 New Revision: 51424 URL: http://svn.reactos.org/svn/reactos?rev=51424&view=rev Log: [shimgvw] Add Italian translation. [mplay32] Fix Italian translation for play. Added: trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc (with props) Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Fri Apr 22 12:30:50 2011 @@ -26,5 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Avanzamento rapido" IDS_TOOLTIP_FORWARD "Successivo" IDS_APPTITLE "Riproduttore multimediale ReactOS" - IDS_PLAY "Mostra" + IDS_PLAY "Riproduci" END Added: trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc [iso-8859-1] Fri Apr 22 12:30:50 2011 @@ -1,0 +1,18 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_APPTITLE "Visualizzatore immagini e fax di ReactOS" + IDS_SETASDESKBG "Imposta come sfondo del desktop" + IDS_PREVIEW "Anteprima" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Immagine successiva" + IDS_TOOLTIP_PREV_PIC "Immagine precedente" + IDS_TOOLTIP_ZOOM_IN "Zoom avanti (+)" + IDS_TOOLTIP_ZOOM_OUT "Zoom indietro (-)" + IDS_TOOLTIP_ROT_CLOCKW "Ruotare in senso orario (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Ruotare in senso antiorario (Ctrl+L)" + IDS_TOOLTIP_PRINT "Stampare (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Salva in... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Fri Apr 22 12:30:50 2011 @@ -6,6 +6,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc"

1 0

[rharabien] 51423: [MPLAY32] * Move "Play" string from shell32. It will be used in audio files context menu in explorer [SHIMGVW] * Move "Preview" string from shell32. It will be used in image file...
by rharabien＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: rharabien Date: Fri Apr 22 11:51:08 2011 New Revision: 51423 URL: http://svn.reactos.org/svn/reactos?rev=51423&view=rev Log: [MPLAY32] * Move "Play" string from shell32. It will be used in audio files context menu in explorer [SHIMGVW] * Move "Preview" string from shell32. It will be used in image files context menu in explorer * Add Polish translation [SHELL32] * Remove "Play" and "Preview" translations - they shouldn't be in shell32 * Add "explore" translation for folder context menu Added: trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/resource.h trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_def_cmenu.c trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc trunk/reactos/dll/win32/shimgvw/lang/en-US.rc trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc trunk/reactos/dll/win32/shimgvw/resource.h trunk/reactos/dll/win32/shimgvw/rsrc.rc Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Òúðñåíå íàïðåä" IDS_TOOLTIP_FORWARD "Òúðñåíå íàïðåä" IDS_APPTITLE "Ìóëòèìåäèéíèÿò âúçïðîèçâîäèòåë íà ÐåàêòÎÑ" + IDS_PLAY "Âúçïðîèçâåæäàíå" END Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -31,4 +31,5 @@ IDS_TOOLTIP_SEEKFORW "Posunout vpøed" IDS_TOOLTIP_FORWARD "Pøeskoèit vpøed" IDS_APPTITLE "ReactOS Pøehrávaè multimédií" + IDS_PLAY "Pøehrát" END Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Schneller Vorlauf" IDS_TOOLTIP_FORWARD "Weiter" IDS_APPTITLE "ReactOS Multimedia Player" + IDS_PLAY "Abspielen" END Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Seek Forward" IDS_TOOLTIP_FORWARD "Skip Forward" IDS_APPTITLE "ReactOS Multimedia Player" + IDS_PLAY "Play" END Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Avance rápido" IDS_TOOLTIP_FORWARD "Marca siguiente" IDS_APPTITLE "Reproductor Multimedia de ReactOS" + IDS_PLAY "Reproducir" END Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Avance rapide" IDS_TOOLTIP_FORWARD "Suivant" IDS_APPTITLE "ReactOS Multimedia Player" + IDS_PLAY "Lire" END Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Avanzamento rapido" IDS_TOOLTIP_FORWARD "Successivo" IDS_APPTITLE "Riproduttore multimediale ReactOS" + IDS_PLAY "Mostra" END Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "OÖV[N" IDS_TOOLTIP_FORWARD "OÖXLbv" IDS_APPTITLE "ReactOS }`fBA v[[" + IDS_PLAY "Ä¶" END Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Vooruitspoelen" IDS_TOOLTIP_FORWARD "Volgende" IDS_APPTITLE "ReactOS Multimedia Player" + IDS_PLAY "Play" END Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Søke fremover" IDS_TOOLTIP_FORWARD "Spole fremover" IDS_APPTITLE "ReactOS Multimedia avspiller" + IDS_PLAY "Spill" END Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -28,4 +28,5 @@ IDS_TOOLTIP_SEEKFORW "Przewiñ do przodu" IDS_TOOLTIP_FORWARD "Przeskocz do przodu" IDS_APPTITLE "ReactOS Multimedia Player" + IDS_PLAY "Odtwórz" END Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -26,4 +26,5 @@ IDS_TOOLTIP_SEEKFORW "Ïåðåìîòêà âïåðåä" IDS_TOOLTIP_FORWARD "Âïåðåä" IDS_APPTITLE "Ïðîèãðûâàòåëü ReactOS" + IDS_PLAY "Âîñïðîèçâåñòè" END Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -31,4 +31,5 @@ IDS_TOOLTIP_SEEKFORW "Vyh¾ada dopredu" IDS_TOOLTIP_FORWARD "Preskoèi dopredu" IDS_APPTITLE "Multimediálny prehrávaè systému ReactOS" + IDS_PLAY "Prehra" END Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -34,4 +34,5 @@ IDS_TOOLTIP_SEEKFORW "Ïåðåìîòóâàííÿ âïåðåä" IDS_TOOLTIP_FORWARD "Âïåðåä" IDS_APPTITLE "Ïðîãðàâà÷ ReactOS" + IDS_PLAY "Â³äòâîðèòè" END Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -22,7 +22,8 @@ #define IDS_TOOLTIP_SEEKBACK 105 #define IDS_TOOLTIP_SEEKFORW 106 #define IDS_TOOLTIP_FORWARD 107 -#define IDS_ALL_TYPES_FILTER 108 +#define IDS_ALL_TYPES_FILTER 108 +#define IDS_PLAY 109 /* Menu */ #define IDR_MAINMENU 500 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -744,12 +744,11 @@ IDS_SYS_FILE "Ñèñòåìåí ôàéë" IDS_OPEN_VERB "Îòâàðÿíå" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Èçïúëíÿâàíå êàòî " IDS_EDIT_VERB "Îáðàáîòêà" IDS_FIND_VERB "Òúðñåíå" IDS_PRINT_VERB "Ðàçïå÷àòâàíå" - IDS_PLAY_VERB "Âúçïðîèçâåæäàíå" - IDS_PREVIEW_VERB "Ïðåãëåä" IDS_FILE_FOLDER "%u ôàéëà, %u ïàïêè" IDS_PRINTERS "Ïå÷àòà÷è" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -730,12 +730,11 @@ IDS_SYS_FILE "Systémový soubor" IDS_OPEN_VERB "Otevøít" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Spustit jako " IDS_EDIT_VERB "Upravit" IDS_FIND_VERB "Najít" IDS_PRINT_VERB "Tisknout" - IDS_PLAY_VERB "Pøehrát" - IDS_PREVIEW_VERB "Náhled" IDS_FILE_FOLDER "%u souborù, %u sloek" IDS_PRINTERS "Tiskárny" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -732,12 +732,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -747,12 +747,11 @@ IDS_SYS_FILE "Systemdatei" IDS_OPEN_VERB "Öffnen" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Ausführen als " IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" - IDS_PLAY_VERB "Abspielen" - IDS_PREVIEW_VERB "Vorschau" IDS_FILE_FOLDER "%u Dateien, %u Ordner" IDS_PRINTERS "Drucker" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -744,12 +744,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -754,12 +754,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -756,12 +756,11 @@ IDS_SYS_FILE "Archivo del sistema" IDS_OPEN_VERB "Abrir" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Ejecutar como ..." IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Buscar" IDS_PRINT_VERB "Imprimir" - IDS_PLAY_VERB "Reproducir" - IDS_PREVIEW_VERB "Vista previa" IDS_FILE_FOLDER "%u Archivos, %u Carpetas" IDS_PRINTERS "Impresoras" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -747,12 +747,11 @@ IDS_SYS_FILE "Fichier système" IDS_OPEN_VERB "Ouvrir" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Lancer en tant que " IDS_EDIT_VERB "Éditer" IDS_FIND_VERB "Chercher" IDS_PRINT_VERB "Imprimer" - IDS_PLAY_VERB "Lire" - IDS_PREVIEW_VERB "Apercevoir" IDS_FILE_FOLDER "%u fichiers, %u répertoires" IDS_PRINTERS "Imprimantes" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -754,12 +754,11 @@ IDS_SYS_FILE "File di sistema" IDS_OPEN_VERB "Apri" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Eseguire come " IDS_EDIT_VERB "Modifica" IDS_FIND_VERB "Cerca" IDS_PRINT_VERB "Stampa" - IDS_PLAY_VERB "Mostra" - IDS_PREVIEW_VERB "Anteprima" IDS_FILE_FOLDER "%u File, %u Cartelle" IDS_PRINTERS "Stampanti" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "VXe t@C" IDS_OPEN_VERB "J" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "ÊÌ[U[ÆµÄÀs " IDS_EDIT_VERB "ÒW" IDS_FIND_VERB "õ" IDS_PRINT_VERB "óü" - IDS_PLAY_VERB "Ä¶" - IDS_PREVIEW_VERB "vr[" IDS_FILE_FOLDER "%u ÂÌt@CA %u ÂÌtH_" IDS_PRINTERS "v^" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "Systemfil" IDS_OPEN_VERB "Åpne" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Kjør som" IDS_EDIT_VERB "Rediger" IDS_FIND_VERB "Finn" IDS_PRINT_VERB "Skriv ut" - IDS_PLAY_VERB "Spill" - IDS_PREVIEW_VERB "Forhåndsvis" IDS_FILE_FOLDER "%u filer, %u mapper" IDS_PRINTERS "Skrivere" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -751,12 +751,11 @@ IDS_SYS_FILE "Plik systemowy" IDS_OPEN_VERB "Otwórz" + IDS_EXPLORE_VERB "Eksploruj" IDS_RUNAS_VERB "Uruchom jako " IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" - IDS_PLAY_VERB "Odtwórz" - IDS_PREVIEW_VERB "Podgl¹d" IDS_FILE_FOLDER "%u Plików, %u Katalogów" IDS_PRINTERS "Drukarki" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -745,12 +745,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "Ficheiro de Sistema" IDS_OPEN_VERB "Abrir" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Executar como " IDS_EDIT_VERB "Editar" IDS_FIND_VERB "Procurar" IDS_PRINT_VERB "Imprimir" - IDS_PLAY_VERB "Reproduzir" - IDS_PREVIEW_VERB "Previzualizar" IDS_FILE_FOLDER "%u Ficheiros, %u Pastas" IDS_PRINTERS "Impressoras" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -746,12 +746,11 @@ IDS_SYS_FILE "FiÈier de sistem" IDS_OPEN_VERB "Deschidere" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Rulare ca " IDS_EDIT_VERB "Editare" IDS_FIND_VERB "CÄutare" IDS_PRINT_VERB "Imprimare" - IDS_PLAY_VERB "Redare" - IDS_PREVIEW_VERB "Previzualizare" IDS_FILE_FOLDER "%u fiÈiere, %u dosare" IDS_PRINTERS "Imprimante" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -742,12 +742,11 @@ IDS_SYS_FILE "Ñèñòåìíûé ôàéë" IDS_OPEN_VERB "Îòêðûòü" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Çàïóñòèòü êàê " IDS_EDIT_VERB "Èçìåíèòü" IDS_FIND_VERB "Ïîèñê" IDS_PRINT_VERB "Ïå÷àòü" - IDS_PLAY_VERB "Âîñïðîèçâåñòè" - IDS_PREVIEW_VERB "Ïðåäïðîñìîòð" IDS_FILE_FOLDER "%u ôàéëîâ, %u ïàïîê" IDS_PRINTERS "Ïðèíòåðû" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -749,12 +749,11 @@ IDS_SYS_FILE "Systémový súbor" IDS_OPEN_VERB "Otvori" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Spusti ako " IDS_EDIT_VERB "Upravi" IDS_FIND_VERB "Find" //Nájs, H¾ada, Vyh¾ada ??? IDS_PRINT_VERB "Tlaèi" - IDS_PLAY_VERB "Prehra" - IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ??? IDS_FILE_FOLDER "súbory: %u, prieèinky: %u" IDS_PRINTERS "Tlaèiarne" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -743,12 +743,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -756,12 +756,11 @@ IDS_SYS_FILE "Ñèñòåìíèé ôàéë" IDS_OPEN_VERB "Â³äêðèòè" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Çàïóñòèòè ÿê " IDS_EDIT_VERB "Çì³íèòè" IDS_FIND_VERB "Ïîøóê" IDS_PRINT_VERB "Äðóê" - IDS_PLAY_VERB "Â³äòâîðèòè" - IDS_PREVIEW_VERB "Ïåðåãëÿä" IDS_FILE_FOLDER "%u ôàéë³â, %u ïàïîê" IDS_PRINTERS "Ïðèíòåðè" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -731,12 +731,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -744,12 +744,11 @@ IDS_SYS_FILE "System file" IDS_OPEN_VERB "Open" + IDS_EXPLORE_VERB "Explore" IDS_RUNAS_VERB "Run as " IDS_EDIT_VERB "Edit" IDS_FIND_VERB "Find" IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -148,12 +148,12 @@ #define IDS_RUNDLG_BROWSE_FILTER 183 #define IDS_OPEN_VERB 300 -#define IDS_RUNAS_VERB 301 -#define IDS_EDIT_VERB 302 -#define IDS_FIND_VERB 303 -#define IDS_PRINT_VERB 304 -#define IDS_PLAY_VERB 305 -#define IDS_PREVIEW_VERB 306 +#define IDS_EXPLORE_VERB 301 +#define IDS_RUNAS_VERB 302 +#define IDS_EDIT_VERB 303 +#define IDS_FIND_VERB 304 +#define IDS_PRINT_VERB 305 + #define IDS_FILE_FOLDER 307 #define IDS_CREATELINK 308 #define IDS_INSTALLNEWFONT 309 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -644,6 +644,8 @@ fState |= MFS_DEFAULT; idResource = IDS_OPEN_VERB; } + else if (!wcsicmp(curEntry->szVerb, L"explore")) + idResource = IDS_EXPLORE_VERB; else if (!wcsicmp(curEntry->szVerb, L"runas")) idResource = IDS_RUNAS_VERB; else if (!wcsicmp(curEntry->szVerb, L"edit")) @@ -652,10 +654,6 @@ idResource = IDS_FIND_VERB; else if (!wcsicmp(curEntry->szVerb, L"print")) idResource = IDS_PRINT_VERB; - else if (!wcsicmp(curEntry->szVerb, L"play")) - idResource = IDS_PLAY_VERB; - else if (!wcsicmp(curEntry->szVerb, L"preview")) - idResource = IDS_PREVIEW_VERB; else idResource = 0; Modified: trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/bg-BG.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -4,6 +4,7 @@ BEGIN IDS_APPTITLE "Ïðåãëåäúò çà ñíèìêè è ôàêñîâå íà ÐåàêòÎÑ" IDS_SETASDESKBG "Ñëàãàíå êàòî ïîäêðàñêà" + IDS_PREVIEW "Ïðåãëåä" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Ñëåäâàùî èçîáðàæåíèå" Modified: trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -7,8 +7,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS prohlíeè obrázkù a faxù" + IDS_APPTITLE "ReactOS prohlíeè obrázkù a faxù" IDS_SETASDESKBG "Nastavit jako pozadí plochy" + IDS_PREVIEW "Náhled" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Dalí obrázek" Modified: trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -2,8 +2,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS-Bild- und Faxansicht" + IDS_APPTITLE "ReactOS-Bild- und Faxansicht" IDS_SETASDESKBG "Als Desktophintergrund setzen" + IDS_PREVIEW "Vorschau" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Nächstes Bild" Modified: trunk/reactos/dll/win32/shimgvw/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/en-US.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -2,8 +2,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS Picture and Fax Viewer" + IDS_APPTITLE "ReactOS Picture and Fax Viewer" IDS_SETASDESKBG "Set as Desktop Background" + IDS_PREVIEW "Preview" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Next Picture" Modified: trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/es-ES.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -2,8 +2,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Visor de imágenes y fax de ReactOS" - IDS_SETASDESKBG "Establecer como fondo de escritorio" + IDS_APPTITLE "Visor de imágenes y fax de ReactOS" + IDS_SETASDESKBG "Establecer como fondo de escritorio" + IDS_PREVIEW "Vista previa" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Imagen siguiente" Modified: trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/lt-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/lt-LT.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -6,8 +6,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS paveikslëliø ir faksogramø perþiûros programa" + IDS_APPTITLE "ReactOS paveikslëliø ir faksogramø perþiûros programa" IDS_SETASDESKBG "Nustatyti kaip darbalaukio fonà" + IDS_PREVIEW "Preview" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Tolesnis paveikslëlis" Modified: trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/no-NO.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -2,8 +2,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "ReactOS bilde og Faks Viser" + IDS_APPTITLE "ReactOS bilde og Faks Viser" IDS_SETASDESKBG "Sett som skrivebord bakgrunn" + IDS_PREVIEW "Skriv ut" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Neste bilde" Added: trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -1,0 +1,18 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "Przegl¹darka obrazów i faxów ReactOS" + IDS_SETASDESKBG "Ustaw jako t³o pulpitu" + IDS_PREVIEW "Podgl¹d" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Nastêpny obraz" + IDS_TOOLTIP_PREV_PIC "Poprzedni obraz" + IDS_TOOLTIP_ZOOM_IN "Powiêksz (+)" + IDS_TOOLTIP_ZOOM_OUT "Pomniejsz (-)" + IDS_TOOLTIP_ROT_CLOCKW "Obróæ zgodnie z ruchem wskazówek zegara (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Obróæ przeciwnie do ruchu wskazówek zegara (Ctrl+L)" + IDS_TOOLTIP_PRINT "Drukuj (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Zapisz jako... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/ru-RU.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -2,8 +2,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Ïðîãðàììà ïðîñìîòðà èçîáðàæåíèé è ôàêñîâ" + IDS_APPTITLE "Ïðîãðàììà ïðîñìîòðà èçîáðàæåíèé è ôàêñîâ" IDS_SETASDESKBG "Óñòàíîâèòü êàê ôîí ðàáî÷åãî ñòîëà" + IDS_PREVIEW "Ïðåäïðîñìîòð" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Ñëåäóþùåå èçîáðàæåíèå" Modified: trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/sk-SK.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -6,8 +6,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Zobrazovaè obrázkov a faxov systému ReactOS" + IDS_APPTITLE "Zobrazovaè obrázkov a faxov systému ReactOS" IDS_SETASDESKBG "Nastavi ako pozadie pracovnej plochy" + IDS_PREVIEW "Preview" //Náh¾ad, Ukáka, Prezrie ??? /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Nasledujúci obrázok" Modified: trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -10,8 +10,9 @@ STRINGTABLE BEGIN - IDS_APPTITLE "Ïðîãðàìà ïåðåãëÿäó çîáðàæåíü ³ ôàêñ³â ReactOS" + IDS_APPTITLE "Ïðîãðàìà ïåðåãëÿäó çîáðàæåíü ³ ôàêñ³â ReactOS" IDS_SETASDESKBG "Âñòàíîâèòè ÿê ôîí ðîáî÷îãî ñòîëó" + IDS_PREVIEW "Ïåðåãëÿä" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Íàñòóïíå çîáðàæåííÿ" Modified: trunk/reactos/dll/win32/shimgvw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/resource… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/resource.h [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -39,6 +39,7 @@ /* Strings */ #define IDS_APPTITLE 100 #define IDS_SETASDESKBG 101 +#define IDS_PREVIEW 550 /* Tooltips strings */ #define IDS_TOOLTIP_NEXT_PIC 300 Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Fri Apr 22 11:51:08 2011 @@ -8,6 +8,7 @@ #include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/lt-LT.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc"

1 0

[akhaldi] 51422: [CMAKE] * Add a couple missing definitions.
by akhaldi＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: akhaldi Date: Fri Apr 22 10:59:15 2011 New Revision: 51422 URL: http://svn.reactos.org/svn/reactos?rev=51422&view=rev Log: [CMAKE] * Add a couple missing definitions. Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Fri Apr 22 10:59:15 2011 @@ -1,5 +1,7 @@ -add_definitions(-D__WINESRC__) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)

1 0

[nyadav] 51421: Add to Build System
by nyadav＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: nyadav Date: Fri Apr 22 08:02:58 2011 New Revision: 51421 URL: http://svn.reactos.org/svn/reactos?rev=51421&view=rev Log: Add to Build System Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] Fri Apr 22 08:02:58 2011 @@ -1,5 +1,6 @@ add_subdirectory(audiosrv) +add_subdirectory(audiosrv2) add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(spoolsv)

1 0

[nyadav] 51420: New Audio Server
by nyadav＠svn.reactos.org 22 Apr '11

22 Apr '11

Author: nyadav Date: Fri Apr 22 07:55:04 2011 New Revision: 51420 URL: http://svn.reactos.org/svn/reactos?rev=51420&view=rev Log: New Audio Server Added: branches/nyadav-audio-branch/base/services/audiosrv2/ (with props) branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/ (with props) branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.cpp (with props) branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.h (with props) branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/dllmain.cpp (with props) branches/nyadav-audio-branch/base/services/audiosrv2/audsrv.c (with props) Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Apr 22 07:55:04 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Apr 22 07:55:04 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.cpp (added) +++ branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.cpp [iso-8859-1] Fri Apr 22 07:55:04 2011 @@ -1,0 +1,14 @@ +// PortInterface.cpp : Defines the exported functions for the DLL application. +// + +#include "PortInterface.h" + +#ifdef __cplusplus +extern "C" { +#endif + + + +#ifdef __cplusplus +} +#endif Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.h (added) +++ branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.h [iso-8859-1] Fri Apr 22 07:55:04 2011 @@ -1,0 +1,47 @@ +#include <windows.h> +#include <memory.h> + +#ifndef _PORTINTERFACE_H +#define _PORTINTERFACE_H + +#define MIXER getmixerengine() + +typedef struct PortStream +{ + int volume; + double freq; + int channels; + int bitspersample; + DWORD channelmask; + HANDLE thread; + struct PortStream * next; +} PortStream; + +typedef struct MixerEngine +{ + int mastervolume; + int mute; + char dead; + double masterfreq; + int masterchannels; + DWORD masterchannelmask; + int masterbitspersample; + int workingbuffer; + PSHORT masterdoublebuf[2]; + HANDLE mixerthread; + HANDLE playerthread; + HANDLE EventPool[2];//0=Played,1=Ready + PortStream * portstream; +} MixerEngine; + +#ifdef __cplusplus +extern "C" { +#endif + +__declspec(dllexport) MixerEngine * getmixerengine(); + +#ifdef __cplusplus +} +#endif + +#endif Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/PortInterface.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/dllmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/dllmain.cpp (added) +++ branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/dllmain.cpp [iso-8859-1] Fri Apr 22 07:55:04 2011 @@ -1,0 +1,68 @@ + +#include "PortInterface.h" + +static MixerEngine * lpvMem = NULL; +static HANDLE hMapObject = NULL; + +BOOL APIENTRY DllMain( HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ +BOOL fInit, fIgnore; + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + hMapObject = CreateFileMapping( + INVALID_HANDLE_VALUE, // use paging file + NULL, // default security attributes + PAGE_READWRITE, // read/write access + 0, // size: high 32-bits + sizeof(MixerEngine),TEXT("MixerEngine")); // size: low 32-bits + if (hMapObject == NULL) + return FALSE; + + fInit = (GetLastError() != ERROR_ALREADY_EXISTS); + + lpvMem = (MixerEngine *)MapViewOfFile( + hMapObject, // object to map view of + FILE_MAP_WRITE, // read/write access + 0, // high offset: map from + 0, // low offset: beginning + 0); // default: map entire file + if (lpvMem == NULL) + return FALSE; + + if (fInit) + lpvMem->dead=0; + lpvMem->masterchannels=0; + lpvMem->masterbitspersample=0; + lpvMem->masterchannelmask=0; + lpvMem->masterdoublebuf[0]=NULL; + lpvMem->masterdoublebuf[1]=NULL; + lpvMem->masterfreq=0; + lpvMem->mastervolume=0; + lpvMem->mute=0; + lpvMem->portstream=NULL; + lpvMem->workingbuffer=0; + lpvMem->mixerthread=NULL; + lpvMem->playerthread=NULL; + lpvMem->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); + lpvMem->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); + + break; + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + break; + case DLL_PROCESS_DETACH: + fIgnore = UnmapViewOfFile(lpvMem); + fIgnore = CloseHandle(hMapObject); + break; + } + return TRUE; +} + +__declspec(dllexport) MixerEngine * getmixerengine() +{ +return lpvMem; +} Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/dllmain.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/PortInterface/dllmain.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: branches/nyadav-audio-branch/base/services/audiosrv2/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audiosrv2/audsrv.c (added) +++ branches/nyadav-audio-branch/base/services/audiosrv2/audsrv.c [iso-8859-1] Fri Apr 22 07:55:04 2011 @@ -1,0 +1,302 @@ +#define _UNICODE +#define UNICODE +#define WIN32_NO_STATUS +#define _KSDDK_ + +#include <windows.h> +#include <mmsystem.h> +#include <stdio.h> +#include <math.h> +#include <setupapi.h> +#include <ndk/ntndk.h> +#include <ks.h> +#include <ksmedia.h> +#include "interface.h" +#include "PortInterface/PortInterface.h" +#define _2pi 6.283185307179586476925286766559 + + + +#include <ks.h> + + +GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; + + +const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSPROPSETID_Sysaudio = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}}; +const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; +const GUID KSINTERFACESETID_Standard = {0x1A8766A0L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; + +void fill(MixerEngine * mixer) +{ + DWORD Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; + UINT i = 0; + mixer->masterchannels=2; + mixer->masterfreq=48000; + mixer->masterbitspersample=16; + mixer->masterchannelmask = KSAUDIO_SPEAKER_STEREO; + mixer->masterdoublebuf[0] = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); + while (i < Length / 2) + { + mixer->masterdoublebuf[0][i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); + i++; + mixer->masterdoublebuf[0][i] = 0x7FFF * sin((0.5 * i - 2) * 500 * _2pi / 48000); + i++; + } +} + +void Playbuffer(MixerEngine * mixer) +{ + SP_DEVICE_INTERFACE_DATA InterfaceData; + SP_DEVINFO_DATA DeviceData; + PSP_DEVICE_INTERFACE_DETAIL_DATA DetailData; + HDEVINFO DeviceHandle; + PKSDATAFORMAT DataFormat; + PWAVEFORMATEXTENSIBLE WaveFormat; + PKSPIN_CONNECT PinConnect; + PKSSTREAM_HEADER Packet; + PKSPROPERTY Property; + KSSTATE State; + DWORD Length; + HANDLE FilterHandle; + HANDLE PinHandle; + PSHORT SoundBuffer; + BOOL Result; + NTSTATUS Status; + + + // + // Get a handle to KS Audio Interfaces + // + DeviceHandle = SetupDiGetClassDevs(&CategoryGuid, + NULL, + NULL, + DIGCF_DEVICEINTERFACE |DIGCF_PRESENT); + + printf("DeviceHandle %p\n", DeviceHandle); + + // + // Enumerate the first interface + // + InterfaceData.cbSize = sizeof(InterfaceData); + InterfaceData.Reserved = 0; + Result = SetupDiEnumDeviceInterfaces(DeviceHandle, + NULL, + &CategoryGuid, + 1, + &InterfaceData); + + printf("SetupDiEnumDeviceInterfaces %u Error %ld\n", Result, GetLastError()); + + // + // Get the interface details (namely the device path) + // + Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); + DetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + DetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + DeviceData.cbSize = sizeof(DeviceData); + DeviceData.Reserved = 0; + Result = SetupDiGetDeviceInterfaceDetail(DeviceHandle, + &InterfaceData, + DetailData, + Length, + NULL, + &DeviceData); + + wprintf(L"SetupDiGetDeviceInterfaceDetail %u Path DetailData %s\n", Result, (LPWSTR)&DetailData->DevicePath[0]); + + // + // Open a handle to the device + // + FilterHandle = CreateFile(DetailData->DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + printf("Handle %p\n", FilterHandle); + + // + // Close the interface handle and clean up + // + //SetupDiDestroyDeviceInfoList(DeviceHandle); + + // + // Allocate a KS Pin Connection Request Structure + // + Length = sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX); + PinConnect = (PKSPIN_CONNECT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Length); + DataFormat = (PKSDATAFORMAT)(PinConnect + 1); + WaveFormat = (PWAVEFORMATEXTENSIBLE)(DataFormat + 1); + + // + // Setup the KS Pin Data + // + + PinConnect->Interface.Set = KSINTERFACESETID_Standard; + PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; + PinConnect->Interface.Flags = 0; + PinConnect->Medium.Set = KSMEDIUMSETID_Standard; + PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; + PinConnect->Medium.Flags = 0; + PinConnect->PinId = 0; + PinConnect->PinToHandle = NULL; + PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; + PinConnect->Priority.PrioritySubClass = 1; + + // + // Setup the KS Data Format Information + // + printf("DataFormat %p %p\n", DataFormat,(PVOID)((((ULONG_PTR)DataFormat + 7)) & ~7)); + + DataFormat->Flags = 0; + DataFormat->Reserved = 0; + DataFormat->MajorFormat = KSDATAFORMAT_TYPE_AUDIO; + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + DataFormat->Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; + DataFormat->SampleSize = mixer->masterchannels * mixer->masterbitspersample / 8; + DataFormat->FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEXTENSIBLE); + + WaveFormat->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + WaveFormat->Format.nChannels = mixer->masterchannels; + WaveFormat->Format.nSamplesPerSec = mixer->masterfreq; + WaveFormat->Format.nBlockAlign = (mixer->masterchannels * mixer->masterbitspersample)/8;; + WaveFormat->Format.nAvgBytesPerSec = WaveFormat->Format.nSamplesPerSec * WaveFormat->Format.nBlockAlign; + WaveFormat->Format.wBitsPerSample = mixer->masterbitspersample; + WaveFormat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + WaveFormat->dwChannelMask = mixer->masterchannelmask; + WaveFormat->Samples.wValidBitsPerSample = mixer->masterbitspersample; + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + + printf("Creating pin\n"); + + // + // Create the pin + // + Status = KsCreatePin(FilterHandle, PinConnect, GENERIC_READ|GENERIC_WRITE, &PinHandle); + + printf("PinHandle %p Status %lx\n", PinHandle, Status); + + + Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; + // + // Create and fill out the KS Stream Packet + // + Packet = (PKSSTREAM_HEADER)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(KSSTREAM_HEADER)); + Packet->Data = mixer->masterdoublebuf[0]; + Packet->FrameExtent = Length; + Packet->DataUsed = Length; + Packet->Size = sizeof(KSSTREAM_HEADER); + Packet->PresentationTime.Numerator = 1; + Packet->PresentationTime.Denominator = 1; + + // + // Setup a KS Property to change the state + // + Property = (PKSPROPERTY)HeapAlloc(GetProcessHeap(), 0, sizeof(KSPROPERTY)); + Property->Set = KSPROPSETID_Connection; + Property->Id = KSPROPERTY_CONNECTION_STATE; + Property->Flags = KSPROPERTY_TYPE_SET; + + // + // Change the state to run + // + State = KSSTATE_RUN; + DeviceIoControl(PinHandle, + IOCTL_KS_PROPERTY, + Property, + sizeof(KSPROPERTY), + &State, + sizeof(State), + &Length, + NULL); + + // + // Play our 1-second buffer + // + DeviceIoControl(PinHandle, + IOCTL_KS_WRITE_STREAM, + NULL, + 0, + Packet, + Packet->Size, + &Length, + NULL); + + // + // Change the state to stop + // + State = KSSTATE_STOP; + DeviceIoControl(PinHandle, + IOCTL_KS_PROPERTY, + Property, + sizeof(KSPROPERTY), + &State, + sizeof(State), + &Length, + NULL); + + CloseHandle(PinHandle); + CloseHandle(FilterHandle); + +} +DWORD WINAPI RunMixerThread(LPVOID param) +{ + MixerEngine * mixer = (MixerEngine *) param; + SetEvent(mixer->EventPool[0]); + while(1) + { + while(WaitForSingleObject(mixer->EventPool[0],100)!=0){if(mixer->dead)goto DEAD;} + fill(mixer); + SetEvent(mixer->EventPool[1]); + } +DEAD: + printf("Mixer Thread Ended\n"); + return 0; +} +DWORD WINAPI RunPlayerThread(LPVOID param) +{ + MixerEngine * mixer = (MixerEngine *) param; + while(1) + { + while(WaitForSingleObject(mixer->EventPool[0],100)!=0){if(mixer->dead)goto DEAD;} + Playbuffer(mixer); + SetEvent(mixer->EventPool[0]); + } +DEAD: + printf("Player Thread Ended\n"); + return 0; +} +void SpawnMixerThread(MixerEngine * mixer) +{ + DWORD dwID; + mixer->mixerthread=CreateThread(NULL,0,RunMixerThread,MIXER,0,&dwID); +} +void SpawnPlayerThread(MixerEngine * mixer) +{ + DWORD dwID; + mixer->playerthread=CreateThread(NULL,0,RunPlayerThread,MIXER,0,&dwID); +} + +int +__cdecl +main(int argc, char* argv[]) +{ + SpawnMixerThread(MIXER); + SpawnPlayerThread(MIXER); + WaitForSingleObject(MIXER->mixerthread,INFINITE); + WaitForSingleObject(MIXER->playerthread,INFINITE); + return 0; +} Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/audsrv.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audiosrv2/audsrv.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[gschneider] 51419: [kernel32] Radek Liska: sync czech NLS resources to Wine See issue #6122 for more details.
by gschneider＠svn.reactos.org 21 Apr '11

21 Apr '11

Author: gschneider Date: Thu Apr 21 21:59:17 2011 New Revision: 51419 URL: http://svn.reactos.org/svn/reactos?rev=51419&view=rev Log: [kernel32] Radek Liska: sync czech NLS resources to Wine See issue #6122 for more details. Modified: trunk/reactos/dll/win32/kernel32/nls/csy.nls Modified: trunk/reactos/dll/win32/kernel32/nls/csy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/csy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/csy.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/csy.nls [iso-8859-1] Thu Apr 21 21:59:17 2011 @@ -64,10 +64,10 @@ LOCALE_S2359 "odp." LOCALE_SABBREVCTRYNAME "CZE" LOCALE_SABBREVDAYNAME1 "po" - LOCALE_SABBREVDAYNAME2 "\x00FAt" + LOCALE_SABBREVDAYNAME2 "út" LOCALE_SABBREVDAYNAME3 "st" - LOCALE_SABBREVDAYNAME4 "\x00E8t" - LOCALE_SABBREVDAYNAME5 "p\x00E1" + LOCALE_SABBREVDAYNAME4 "èt" + LOCALE_SABBREVDAYNAME5 "pá" LOCALE_SABBREVDAYNAME6 "so" LOCALE_SABBREVDAYNAME7 "ne" LOCALE_SABBREVLANGNAME "CSY" @@ -85,13 +85,13 @@ LOCALE_SABBREVMONTHNAME12 "XII" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Czech Republic" - LOCALE_SCURRENCY "K\x00E8" + LOCALE_SCURRENCY "Kè" LOCALE_SDATE "." - LOCALE_SDAYNAME1 "pond\x00ECl\x00EC" - LOCALE_SDAYNAME2 "\x00FAter\x00FD" - LOCALE_SDAYNAME3 "st\x00F8eda" - LOCALE_SDAYNAME4 "\x00E8tvrtek" - LOCALE_SDAYNAME5 "p\x00E1tek" + LOCALE_SDAYNAME1 "pondìlí" + LOCALE_SDAYNAME2 "úterý" + LOCALE_SDAYNAME3 "støeda" + LOCALE_SDAYNAME4 "ètvrtek" + LOCALE_SDAYNAME5 "pátek" LOCALE_SDAYNAME6 "sobota" LOCALE_SDAYNAME7 "nedìle" LOCALE_SDECIMAL "," @@ -108,30 +108,30 @@ LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "leden" - LOCALE_SMONTHNAME2 "\x00FAnor" - LOCALE_SMONTHNAME3 "b\x00F8ezen" + LOCALE_SMONTHNAME2 "únor" + LOCALE_SMONTHNAME3 "bøezen" LOCALE_SMONTHNAME4 "duben" LOCALE_SMONTHNAME5 "kvìten" - LOCALE_SMONTHNAME6 "\x00E8erven" - LOCALE_SMONTHNAME7 "\x00E8ervenec" + LOCALE_SMONTHNAME6 "èerven" + LOCALE_SMONTHNAME7 "èervenec" LOCALE_SMONTHNAME8 "srpen" - LOCALE_SMONTHNAME9 "z\x00E1\x00F8\x00ED" - LOCALE_SMONTHNAME10 "\x00F8\x00EDjen" + LOCALE_SMONTHNAME9 "záøí" + LOCALE_SMONTHNAME10 "øíjen" LOCALE_SMONTHNAME11 "listopad" LOCALE_SMONTHNAME12 "prosinec" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP " " + LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "cs-CZ" - LOCALE_SNATIVECTRYNAME "\x00C8esk\x00E1 republika" - LOCALE_SNATIVECURRNAME "Koruna \x00C8esk\x00E1" + LOCALE_SNATIVECTRYNAME "Èeská republika" + LOCALE_SNATIVECURRNAME "Koruna Èeská" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVELANGNAME "\x00E8e\x009Atina" + LOCALE_SNATIVELANGNAME "èetina" LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" LOCALE_SSHORTDATE "d.M.yyyy" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND " " + LOCALE_STHOUSAND " " LOCALE_STIME ":" LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" @@ -148,7 +148,7 @@ LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian"

1 0

[tkreuzer] 51418: [CRT] Fix a typo in a comment
by tkreuzer＠svn.reactos.org 21 Apr '11

21 Apr '11

Author: tkreuzer Date: Thu Apr 21 21:49:46 2011 New Revision: 51418 URL: http://svn.reactos.org/svn/reactos?rev=51418&view=rev Log: [CRT] Fix a typo in a comment Modified: trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c Modified: trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/_flsbuf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/_flsbuf.c [iso-8859-1] Thu Apr 21 21:49:46 2011 @@ -24,7 +24,7 @@ return EOF; } - /* Is this was a read buffer */ + /* Check if this was a read buffer */ if (stream->_flag & _IOREAD) { /* Must be at the end of the file */

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