Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 61651: [CDMAKE] - Correctly free DIR_RECORD::joliet_name
by tfaber＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: tfaber Date: Fri Jan 17 16:05:29 2014 New Revision: 61651 URL: http://svn.reactos.org/svn/reactos?rev=61651&view=rev Log: [CDMAKE] - Correctly free DIR_RECORD::joliet_name Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Fri Jan 17 16:05:29 2014 @@ -211,10 +211,12 @@ struct directory_record *next = root.next_in_memory->next_in_memory; if (joliet) - free (root.joliet_name); + free (root.next_in_memory->joliet_name); free (root.next_in_memory); root.next_in_memory = next; } + if (joliet) + free (root.joliet_name); if (cd.buffer != NULL) { free (cd.buffer);

1 0

[aandrejevic] 61650: [FAST486] Implement the LAR instruction.
by aandrejevic＠svn.reactos.org 17 Jan '14

17 Jan '14

Author: aandrejevic Date: Fri Jan 17 03:15:27 2014 New Revision: 61650 URL: http://svn.reactos.org/svn/reactos?rev=61650&view=rev Log: [FAST486] Implement the LAR instruction. Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Fri Jan 17 03:15:27 2014 @@ -39,7 +39,7 @@ { Fast486OpcodeGroup0F00, Fast486OpcodeGroup0F01, - NULL, // TODO: OPCODE 0x02 NOT IMPLEMENTED + Fast486ExtOpcodeLar, Fast486ExtOpcodeLsl, NULL, // Invalid NULL, // Invalid @@ -297,6 +297,134 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLar) +{ + BOOLEAN OperandSize, AddressSize; + FAST486_MOD_REG_RM ModRegRm; + USHORT Selector; + FAST486_GDT_ENTRY GdtEntry; + DWORD AccessRights; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + /* Not recognized */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + NO_LOCK_PREFIX(); + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Value; + + /* Read the value */ + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + Selector = LOWORD(Value); + } + else + { + /* Read the value */ + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, &Selector)) + { + /* Exception occurred */ + return FALSE; + } + } + + if (!(Selector & SEGMENT_TABLE_INDICATOR)) + { + /* Check if the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* Check if the LDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Limit + 1)) + { + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Read the LDT */ + if (!Fast486ReadLinearMemory(State, + State->Ldtr.Base + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Privilege check */ + if (((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl)) + || (Fast486GetCurrentPrivLevel(State) > GdtEntry.Dpl)) + { + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Set ZF */ + State->Flags.Zf = TRUE; + + /* Get the access rights */ + AccessRights = ((PDWORD)&GdtEntry)[1] & 0x00F0FF00; + + /* Return the access rights */ + if (OperandSize) + { + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, TRUE, AccessRights)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, TRUE, LOWORD(AccessRights))) + { + /* Exception occurred */ + return FALSE; + } + } + + return TRUE; +} + FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLsl) { BOOLEAN OperandSize, AddressSize; Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Fri Jan 17 03:15:27 2014 @@ -26,6 +26,7 @@ /* DEFINES ********************************************************************/ +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLar); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLsl); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeClts); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreControlReg);

1 0

[gadamopoulos] 61649: [uxtheme] - Use ExtCreateRegion in GetThemeBackgroundRegion as it was fixed in win32k
by gadamopoulos＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: gadamopoulos Date: Thu Jan 16 21:47:26 2014 New Revision: 61649 URL: http://svn.reactos.org/svn/reactos?rev=61649&view=rev Log: [uxtheme] - Use ExtCreateRegion in GetThemeBackgroundRegion as it was fixed in win32k Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Thu Jan 16 21:47:26 2014 @@ -1755,20 +1755,15 @@ static HRGN UXTHEME_RegionFromDibBits(RGBQUAD* pBuffer, RGBQUAD* pclrTransparent, LPCRECT pRect) { int x, y, xstart; -#ifdef EXTCREATEREGION_WORKS int cMaxRgnRects, cRgnDataSize, cRgnRects; RECT* prcCurrent; PRGNDATA prgnData; -#else - HRGN hrgnTemp; -#endif ULONG clrTransparent, *pclrCurrent; HRGN hrgnRet; pclrCurrent = (PULONG)pBuffer; clrTransparent = *(PULONG)pclrTransparent; -#ifdef EXTCREATEREGION_WORKS /* Create a region and pre-allocate memory enough for 3 spaces in one row*/ cRgnRects = 0; cMaxRgnRects = 4* (pRect->bottom-pRect->top); @@ -1778,9 +1773,6 @@ prgnData = (PRGNDATA)HeapAlloc(GetProcessHeap(), 0, cRgnDataSize); prcCurrent = (PRECT)prgnData->Buffer; -#else - hrgnRet = CreateRectRgn(0,0,0,0); -#endif /* Calculate the region rects */ y=0; @@ -1804,7 +1796,6 @@ pclrCurrent++; } -#ifdef EXTCREATEREGION_WORKS /* Add the scaned line to the region */ SetRect(prcCurrent, xstart, y,x,y+1); prcCurrent++; @@ -1821,11 +1812,6 @@ cRgnDataSize); prcCurrent = (RECT*)prgnData->Buffer + cRgnRects; } -#else - hrgnTemp = CreateRectRgn(xstart, y,x,y+1); - CombineRgn(hrgnRet, hrgnRet, hrgnTemp, RGN_OR ); - DeleteObject(hrgnTemp); -#endif } else { @@ -1836,7 +1822,6 @@ y++; } -#ifdef EXTCREATEREGION_WORKS /* Fill the region data header */ prgnData->rdh.dwSize = sizeof(prgnData->rdh); prgnData->rdh.iType = RDH_RECTANGLES; @@ -1849,7 +1834,6 @@ /* Free the region data*/ HeapFree(GetProcessHeap(),0,prgnData); -#endif /* return the region*/ return hrgnRet;

1 0

[cwittich] 61648: [usetup] fix layout issue in invalid partition error message
by cwittich＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: cwittich Date: Thu Jan 16 20:31:51 2014 New Revision: 61648 URL: http://svn.reactos.org/svn/reactos?rev=61648&view=rev Log: [usetup] fix layout issue in invalid partition error message Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1360,7 +1360,7 @@ "\n" "ê§¤ ¢ ¥â® ¨«¨ ¨§âà¨¢ ¥â® ¤ï«®¢¥ ¬®¦¥ ¤ ã¨é®¦¨ ¤ï«®¢ â â ¡«¨æ .\n" "\n" - " \x07 ¨§å®¤ â¨á¥â¥ F3." + " \x07 ¨§å®¤ â¨á¥â¥ F3.\n" " \x07 â¨á¥â¥ ENTER § ¯à®¤ê«¦ ¢ ¥.", "F3 = §å®¤ ENTER = à®¤ê«¦ ¢ ¥" }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1380,7 +1380,7 @@ "\n" " £ ¦¬¨å ã ¨ã partitions £§¦¨å ¤ ¡«©«¨â¯ «¦ partiton table.\n" "\n" - " \x07 «ã©« F3 ¤ §¦®à¨ã©« §æ «¤ ¡«á©«©." + " \x07 «ã©« F3 ¤ §¦®à¨ã©« §æ «¤ ¡«á©«©.\n" " \x07 «ã©« ENTER ¤ ©¬¤®å©«.", "F3= §¦®é¨© ENTER = ¬¤â® " }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1350,7 +1350,7 @@ "\n" "Partitsioonide loomine väi kustutamine väib vigastada partitsioonitabelit.\n" "\n" - " \x07 Vajuta F3, et vljuda paigaldusest.." + " \x07 Vajuta F3, et vljuda paigaldusest..\n" " \x07 Vajuta ENTER, et jtkata.", "F3= Vlju ENTER = Jtka" }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1363,7 +1363,7 @@ "\n" "Crer ou effacer des partitions peut dtruire la table de partition.\n" "\n" - " \x07 Appuyer sur F3 pour quitter Setup." + " \x07 Appuyer sur F3 pour quitter Setup.\n" " \x07 Appuyer sur ENTRE pour continuer Setup.", "F3= Quitter ENTRE = Continuer" }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1351,7 +1351,7 @@ "\n" "Il creare o cancellare partizioni pu distruggere la tabella delle partizioni.\n" "\n" - " \x07 Premere F3 per uscire dal Setup." + " \x07 Premere F3 per uscire dal Setup.\n" " \x07 Premere INVIO per continuare.", "F3= Uscire INVIO = Continuare" }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1360,7 +1360,7 @@ "\n" "Creating or deleting partitions can destroy the partition table.\n" "\n" - " \x07 Press F3 to quit Setup." + " \x07 Press F3 to quit Setup.\n" " \x07 Press ENTER to continue.", "F3= Quit ENTER = Continue" }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1359,7 +1359,7 @@ "\n" "Tworzenie lub kasowanie partycji mo¾e zniszczy ca¥ tablic© partycji.\n" "\n" - " \x07 Nacinij F3, aby wyj z instalatora." + " \x07 Nacinij F3, aby wyj z instalatora.\n" " \x07 Nacinij ENTER, aby kontynuowa.", "F3= Wyjcie ENTER = Kontynuacja" }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Jan 16 20:31:51 2014 @@ -1351,7 +1351,7 @@ "\n" "®§¤ ¨¥ ¨«¨ ã¤ «¥¨¥ à §¤¥«®¢ ¬®¦¥â àãè¨âì â ¡«¨æã à §¤¥«®¢.\n" "\n" - " \x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨." + " \x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨.\n" " \x07 ¦¬¨â¥ ENTER ¤«ï ¯à®¤®«¦¥¨ï.", "F3 = ëå®¤ ENTER = à®¤®«¦¨âì" },

1 0

[spetreolle] 61647: [CDMAKE] dir_hash_add_file: don't leak targetdir (14000 bytes saved per run)
by spetreolle＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: spetreolle Date: Thu Jan 16 18:36:32 2014 New Revision: 61647 URL: http://svn.reactos.org/svn/reactos?rev=61647&view=rev Log: [CDMAKE] dir_hash_add_file: don't leak targetdir (14000 bytes saved per run) Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jan 16 18:36:32 2014 @@ -152,6 +152,7 @@ normalize_dirname(targetnorm); de = dir_hash_create_dir(dh, targetdir, targetnorm); free(targetnorm); + free(targetdir); tf = calloc(1, sizeof(*tf)); tf->next = de->head; de->head = tf;

1 0

[tfaber] 61646: [NTOS:MM] - Output debug information before ASSERTing. CORE-7671 - FORCEINLINE belongs before the return type (-Wold-style-declaration)
by tfaber＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: tfaber Date: Thu Jan 16 16:56:30 2014 New Revision: 61646 URL: http://svn.reactos.org/svn/reactos?rev=61646&view=rev Log: [NTOS:MM] - Output debug information before ASSERTing. CORE-7671 - FORCEINLINE belongs before the return type (-Wold-style-declaration) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jan 16 16:56:30 2014 @@ -1006,8 +1006,8 @@ // // Updates a valid PTE // -VOID -FORCEINLINE +FORCEINLINE +VOID MI_UPDATE_VALID_PTE(IN PMMPTE PointerPte, IN MMPTE TempPte) { @@ -1035,8 +1035,8 @@ // // Erase the PTE completely // -VOID -FORCEINLINE +FORCEINLINE +VOID MI_ERASE_PTE(IN PMMPTE PointerPte) { /* Zero out the PTE */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Jan 16 16:56:30 2014 @@ -1692,7 +1692,12 @@ if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { Status = MmQuerySectionView(MemoryArea, BaseAddress, &MemoryInfo, &ResultLength); - ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p), BaseAddress=%p", + MemoryArea, MemoryArea->StartingAddress, MemoryArea->EndingAddress, BaseAddress); + NT_ASSERT(NT_SUCCESS(Status)); + } } else { @@ -1733,7 +1738,7 @@ ObDereferenceObject(TargetProcess); } - /* Return the data, NtQueryInformation already probed it*/ + /* Return the data, NtQueryInformation already probed it */ if (PreviousMode != KernelMode) { _SEH2_TRY

1 0

[tfaber] 61645: [CMLIB] - Fix implicit function declaration
by tfaber＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: tfaber Date: Thu Jan 16 11:00:29 2014 New Revision: 61645 URL: http://svn.reactos.org/svn/reactos?rev=61645&view=rev Log: [CMLIB] - Fix implicit function declaration Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6164… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Thu Jan 16 11:00:29 2014 @@ -47,6 +47,10 @@ VOID NTAPI KeQuerySystemTime( OUT PLARGE_INTEGER CurrentTime); + + WCHAR NTAPI + RtlUpcaseUnicodeChar( + IN WCHAR Source); VOID NTAPI RtlInitializeBitMap(

1 0

[tfaber] 61644: [SNDREC32:FORMATTING] - Fix spacing
by tfaber＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: tfaber Date: Thu Jan 16 10:47:14 2014 New Revision: 61644 URL: http://svn.reactos.org/svn/reactos?rev=61644&view=rev Log: [SNDREC32:FORMATTING] - Fix spacing Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu Jan 16 10:47:14 2014 @@ -113,7 +113,7 @@ MSG msg; HACCEL hAccelTable; - + s_info.cbSize = sizeof( NONCLIENTMETRICS ); InitCommonControls(); @@ -233,7 +233,7 @@ return (int)msg.wParam; } -ATOM +ATOM MyRegisterClass(HINSTANCE hInstance) { WNDCLASSEX wcex; @@ -255,7 +255,7 @@ return RegisterClassEx(&wcex); } -BOOL +BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { HWND hWnd; @@ -286,7 +286,7 @@ return TRUE; } -ATOM +ATOM MyRegisterClass_wave(HINSTANCE hInstance) { WNDCLASSEX wcex; @@ -308,7 +308,7 @@ return RegisterClassEx(&wcex); } -BOOL +BOOL InitInstance_wave(HWND f, HINSTANCE hInstance, int nCmdShow) @@ -343,7 +343,7 @@ } LRESULT -CALLBACK +CALLBACK WndProc_wave(HWND hWnd, UINT message, WPARAM wParam, @@ -426,7 +426,7 @@ } LRESULT -CALLBACK +CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, @@ -615,24 +615,24 @@ ofn.lpstrFilter = TEXT("Audio Files (*.wav)\0*.wav\0All Files (*.*)\0*.*\0"); ofn.lpstrFile = file_path; ofn.nMaxFile = MAX_PATH; - + ofn.lpstrDefExt = TEXT("wav"); - - if (GetSaveFileName (&ofn)) + + if (GetSaveFileName (&ofn)) { write_wav(file_path); EnableMenuItem(GetMenu(hWnd), ID_FILE_SAVE, MF_ENABLED); } - break; - - - case ID_EDIT_AUDIOPROPS: - ShellExecute( NULL, NULL, _T("rundll32.exe"), _T("shell32.dll,Control_RunDLL mmsys.cpl,ShowAudioPropertySheet"), NULL, SW_SHOWNORMAL ); - break; - - case ID_FILE_EXIT: - DestroyWindow( hWnd ); - break; + break; + + + case ID_EDIT_AUDIOPROPS: + ShellExecute(NULL, NULL, _T("rundll32.exe"), _T("shell32.dll,Control_RunDLL mmsys.cpl,ShowAudioPropertySheet"), NULL, SW_SHOWNORMAL); + break; + + case ID_FILE_EXIT: + DestroyWindow(hWnd); + break; /* Sndrec32 buttons routines */ case BUTSTART_ID: @@ -750,7 +750,7 @@ case WM_TIMER: switch (wParam) { - case 1: + case 1: if (stopped_flag) { KillTimer(hWnd, 1); @@ -841,7 +841,7 @@ ExtTextOut(hdc, STRBUF_X, STRBUF_Y, - ETO_OPAQUE, + ETO_OPAQUE, 0, str_tmp, _tcslen(str_tmp), @@ -1115,7 +1115,7 @@ TEXT("File Error, WriteFile() failed."), TEXT("ERROR"), MB_OK | MB_ICONERROR); - + CloseHandle(file); return FALSE; } @@ -1127,7 +1127,7 @@ TEXT("File Error, WriteFile() failed."), TEXT("ERROR"), MB_OK | MB_ICONERROR); - + CloseHandle(file); return FALSE; }

1 0

[tfaber] 61643: [CDMAKE] - When deleting a directory entry, also remove it from the hash table. This prevents use after free in the case of a hash collision CORE-7774 #resolve
by tfaber＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: tfaber Date: Thu Jan 16 10:29:51 2014 New Revision: 61643 URL: http://svn.reactos.org/svn/reactos?rev=61643&view=rev Log: [CDMAKE] - When deleting a directory entry, also remove it from the hash table. This prevents use after free in the case of a hash collision CORE-7774 #resolve Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jan 16 10:29:51 2014 @@ -10,7 +10,7 @@ { unsigned int val = 5381; int i = 0; - + for (i = 0; name[i]; i++) { val = (33 * val) + name[i]; @@ -63,6 +63,19 @@ while (de && strcmp(de->normalized_name, norm)) de = de->next; return de; +} + +static void +delete_entry_by_normname(struct target_dir_hash *dh, const char *norm) +{ + unsigned int hashcode; + struct target_dir_entry **ent; + hashcode = djb_hash(norm); + ent = &dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; + while (*ent && strcmp((*ent)->normalized_name, norm)) + ent = &(*ent)->next; + if (*ent) + *ent = (*ent)->next; } void normalize_dirname(char *filename) @@ -147,9 +160,9 @@ } struct target_dir_entry * -dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) -{ - if (t->i == -1) +dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) +{ + if (t->i == -1) return NULL; if (!t->it) { @@ -177,14 +190,16 @@ } } -void dir_hash_destroy_dir(struct target_dir_entry *de) +static void +dir_hash_destroy_dir(struct target_dir_hash *dh, struct target_dir_entry *de) { struct target_file *tf; struct target_dir_entry *te; + unsigned int hashcode; while ((te = de->child)) { de->child = te->next; - dir_hash_destroy_dir(te); + dir_hash_destroy_dir(dh, te); free(te); } while ((tf = de->head)) @@ -194,11 +209,12 @@ free(tf->target_name); free(tf); } + delete_entry_by_normname(dh, de->normalized_name); free(de->normalized_name); free(de->case_name); } void dir_hash_destroy(struct target_dir_hash *dh) { - dir_hash_destroy_dir(&dh->root); -} + dir_hash_destroy_dir(dh, &dh->root); +}

1 0

[dreimer] 61642: [SNDREC32] add missing menus and implement Edit->Audio Properties by Robert Naumann CORE-7442 #resolve
by dreimer＠svn.reactos.org 16 Jan '14

16 Jan '14

Author: dreimer Date: Thu Jan 16 00:56:59 2014 New Revision: 61642 URL: http://svn.reactos.org/svn/reactos?rev=61642&view=rev Log: [SNDREC32] add missing menus and implement Edit->Audio Properties by Robert Naumann CORE-7442 #resolve Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc trunk/reactos/base/applications/sndrec32/lang/de-DE.rc trunk/reactos/base/applications/sndrec32/lang/en-US.rc trunk/reactos/base/applications/sndrec32/lang/es-ES.rc trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc trunk/reactos/base/applications/sndrec32/lang/he-IL.rc trunk/reactos/base/applications/sndrec32/lang/it-IT.rc trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc trunk/reactos/base/applications/sndrec32/resource.h trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,5 +13,5 @@ rsrc.rc) set_module_type(sndrec32 win32gui UNICODE) -add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32) +add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32) add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -18,7 +18,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS ZÃ¡znam zvuku, verze 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -26,18 +26,43 @@ BEGIN POPUP "Soubor" BEGIN - MENUITEM "NovÃ½", ID_NEW + MENUITEM "NovÃ½", ID_FILE_NEW MENUITEM "OtevÅÃt...", ID_FILE_OPEN MENUITEM "UloÅ¾it", ID_FILE_SAVE, GRAYED MENUITEM "UloÅ¾it jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Konec", ID_EXIT + MENUITEM "Konec", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" + POPUP "&Edit" BEGIN - MENUITEM "O programu...", ID__ABOUT + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "O programu...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -12,27 +12,52 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "ReactOS Audiorecorder, Version 1.0", IDC_STATIC, 16, 16, 134, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 16, 25, 134, 8 + LTEXT "ReactOS Audiorecorder, Version 1.0", IDC_STATIC, 56, 16, 134, 8, SS_NOPREFIX + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 134, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END IDR_MENU1 MENU BEGIN - POPUP "Datei" + POPUP "&Datei" BEGIN - MENUITEM "Neu", ID_NEW - MENUITEM "Ãffnen...", ID_FILE_OPEN - MENUITEM "Speichern", ID_FILE_SAVE, GRAYED - MENUITEM "Speichern unter...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Neu", ID_FILE_NEW + MENUITEM "Ã&ffnen...", ID_FILE_OPEN + MENUITEM "&Speichern", ID_FILE_SAVE, GRAYED + MENUITEM "Speichern &unter...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&Wiederherstellen...", ID_FILE_RESTORE, GRAYED + MENUITEM "&Eigenschaften", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Beenden", ID_EXIT + MENUITEM "&Beenden", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" + POPUP "&Bearbeiten" BEGIN - MENUITEM "Ãber...", ID__ABOUT + MENUITEM "&Kopieren", ID_EDIT_COPY + MENUITEM "&EinfÃ¼gen", ID_EDIT_PASTE, GRAYED + MENUITEM "&Mix EinfÃ¼gen", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Datei einfÃ¼gen...", ID_EDIT_INSERTFILE + MENUITEM "D&atei einmischen...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Vor aktueller Position &lÃ¶schen",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Nach aktueller Position lÃ¶&schen",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udioeigenschaften", ID_EDIT_AUDIOPROPS + END + POPUP "&Effekte" + BEGIN + MENUITEM "LautstÃ¤rke &erhÃ¶hen (um 25%)",ID_EFFECTS_INCVOL + MENUITEM "LautstÃ¤rke &verringern", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "Geschwindigkeit er&hÃ¶hen (um 100%)",ID_EFFECTS_INCSPD + MENUITEM "Geschwindigkeit ver&ringern", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "E&cho hinzufÃ¼gen", ID_EFFECTS_ECHO + MENUITEM "&Umkehren", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "Inf&o...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS Sound Recorder, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "File" BEGIN - MENUITEM "New", ID_NEW + MENUITEM "New", ID_FILE_NEW MENUITEM "Open...", ID_FILE_OPEN MENUITEM "Save", ID_FILE_SAVE, GRAYED MENUITEM "Save As...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Exit", ID_EXIT + MENUITEM "Exit", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" + POPUP "&Edit" BEGIN - MENUITEM "About...", ID__ABOUT + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position", ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position", ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "About...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Grabadora de sonidos ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Aceptar", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "Archivo" BEGIN - MENUITEM "Nuevo", ID_NEW + MENUITEM "Nuevo", ID_FILE_NEW MENUITEM "Abrir...", ID_FILE_OPEN MENUITEM "Guardar", ID_FILE_SAVE, GRAYED MENUITEM "Guardar como...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Salir", ID_EXIT + MENUITEM "Salir", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Acerca de...", ID__ABOUT + MENUITEM "Acerca de...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Enregistreur de Son ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Accepter", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "Fichier" BEGIN - MENUITEM "Nouveau", ID_NEW + MENUITEM "Nouveau", ID_FILE_NEW MENUITEM "Ouvrir...", ID_FILE_OPEN MENUITEM "Enregistrer", ID_FILE_SAVE, GRAYED MENUITEM "Enregistrer sous...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Sortir", ID_EXIT + MENUITEM "Sortir", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Ã propos...", ID__ABOUT + MENUITEM "Ã propos...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/he-IL.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "×¨×©××§×× ×©× ReactOS ××¨×¡× 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "××××××ª ×××¦×¨×× (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "××××××ª ×××¦×¨×× (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "×××©××¨", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "×§×××¥" BEGIN - MENUITEM "×××©", ID_NEW + MENUITEM "×××©", ID_FILE_NEW MENUITEM "×¤×ª×...", ID_FILE_OPEN MENUITEM "×©×××¨", ID_FILE_SAVE, GRAYED MENUITEM "×©×××¨ ××©×...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "××¦×××", ID_EXIT + MENUITEM "××¦×××", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "×××××ª...", ID__ABOUT + MENUITEM "×××××ª...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS registratore audio, versione 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "File" BEGIN - MENUITEM "Nuovo", ID_NEW + MENUITEM "Nuovo", ID_FILE_NEW MENUITEM "Apri...", ID_FILE_OPEN MENUITEM "Salva", ID_FILE_SAVE, GRAYED MENUITEM "Salva con nome...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Esci", ID_EXIT + MENUITEM "Esci", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Informazioni...", ID__ABOUT + MENUITEM "Informazioni...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "reactOS_sndrec32, ãã¼ã¸ã§ã³ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "ãã¡ã¤ã«" BEGIN - MENUITEM "æ°è¦ä½æ", ID_NEW + MENUITEM "æ°è¦ä½æ", ID_FILE_NEW MENUITEM "éã...", ID_FILE_OPEN MENUITEM "ä¸æ¸ãä¿å", ID_FILE_SAVE, GRAYED MENUITEM "ååãã¤ãã¦ä¿å...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "çµäº", ID_EXIT + MENUITEM "çµäº", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "ãã¼ã¸ã§ã³æå ±...", ID__ABOUT + MENUITEM "ãã¼ã¸ã§ã³æå ±...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -21,7 +21,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Rejestrator dÅºwiÄku ReactOS, wersja 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -29,18 +29,43 @@ BEGIN POPUP "Plik" BEGIN - MENUITEM "Nowy", ID_NEW + MENUITEM "Nowy", ID_FILE_NEW MENUITEM "OtwÃ³rz...", ID_FILE_OPEN MENUITEM "Zapisz", ID_FILE_SAVE, GRAYED MENUITEM "Zapisz jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "WyjÅcie", ID_EXIT + MENUITEM "WyjÅcie", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "O programie...", ID__ABOUT + MENUITEM "O programie...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -22,7 +22,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Ãnregistrator audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Drept de autor (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Drept de autor (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Ã&nchide", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -30,18 +30,43 @@ BEGIN POPUP "&FiÈier" BEGIN - MENUITEM "&Nou", ID_NEW + MENUITEM "&Nou", ID_FILE_NEW MENUITEM "&Deschidereâ¦", ID_FILE_OPEN MENUITEM "PÄ&streazÄ", ID_FILE_SAVE, GRAYED MENUITEM "&PÄstrare Ã®nâ¦", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "I&eÈire", ID_EXIT + MENUITEM "I&eÈire", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "&?" BEGIN - MENUITEM "&Despreâ¦", ID__ABOUT + MENUITEM "&Despreâ¦", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -18,7 +18,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "reactOS_sndrec32, verzia 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "AutorskÃ© prÃ¡va (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "AutorskÃ© prÃ¡va (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -26,18 +26,43 @@ BEGIN POPUP "&SÃºbor" BEGIN - MENUITEM "NovÃ½", ID_NEW + MENUITEM "NovÃ½", ID_FILE_NEW MENUITEM "OtvoriÅ¥...", ID_FILE_OPEN MENUITEM "UloÅ¾iÅ¥", ID_FILE_SAVE, GRAYED MENUITEM "UloÅ¾iÅ¥ ako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "SkonÄiÅ¥", ID_EXIT + MENUITEM "SkonÄiÅ¥", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Ä&o je...", ID__ABOUT + MENUITEM "Ä&o je...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -17,7 +17,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS Rregjistruesi i Zerit, versioni 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "T'drejtat (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "T'drejtat (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -25,18 +25,43 @@ BEGIN POPUP "File" BEGIN - MENUITEM "E Re ", ID_NEW + MENUITEM "E Re ", ID_FILE_NEW MENUITEM "Hap...", ID_FILE_OPEN MENUITEM "Ruaj", ID_FILE_SAVE, GRAYED MENUITEM "Ruaj si...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Dil", ID_EXIT + MENUITEM "Dil", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position", ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position", ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Rreth...", ID__ABOUT + MENUITEM "Rreth...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS_sndrec32, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "Arkiv" BEGIN - MENUITEM "Ny", ID_NEW + MENUITEM "Ny", ID_FILE_NEW MENUITEM "Ãppna...", ID_FILE_OPEN MENUITEM "Spara", ID_FILE_SAVE, GRAYED MENUITEM "Spara som...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Avsluta", ID_EXIT + MENUITEM "Avsluta", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "HjÃ¤lp" BEGIN - MENUITEM "Om...", ID__ABOUT + MENUITEM "Om...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Ses Kaydedicisi: SÃ¼rÃ¼m 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Tekif HakkÄ± - 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Tekif HakkÄ± - 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Tamam", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni", ID_NEW + MENUITEM "&Yeni", ID_FILE_NEW MENUITEM "&AÃ§...", ID_FILE_OPEN MENUITEM "&Kaydet", ID_FILE_SAVE, GRAYED MENUITEM "Ay&rÄ± Kaydet...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å", ID_EXIT + MENUITEM "&ÃÄ±kÄ±Å", ID_FILE_EXIT END - MENUITEM "YapÄ±lacak", 0 - MENUITEM "YapÄ±lacak_2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "&YardÄ±m" BEGIN - MENUITEM "&HakkÄ±nda", ID__ABOUT + MENUITEM "&HakkÄ±nda", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "reactOS_sndrec32, Ð²ÐµÑÑÑÑ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "ÐÐ¾Ð²Ð¸Ð¹", ID_NEW + MENUITEM "ÐÐ¾Ð²Ð¸Ð¹", ID_FILE_NEW MENUITEM "ÐÑÐ´ÐºÑÐ¸ÑÐ¸...", ID_FILE_OPEN MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸", ID_FILE_SAVE, GRAYED MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐº...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "ÐÐ¸ÑÑÐ´", ID_EXIT + MENUITEM "ÐÐ¸ÑÑÐ´", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties",ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", ID__ABOUT + MENUITEM "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS å½é³æºï¼çæ¬ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "çæææ (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "çæææ (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "ç¡®å®", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "æä»¶" BEGIN - MENUITEM "æ°å»º", ID_NEW + MENUITEM "æ°å»º", ID_FILE_NEW MENUITEM "æå¼...", ID_FILE_OPEN MENUITEM "ä¿å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åä¸º...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "éåº", ID_EXIT + MENUITEM "éåº", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "å¸®å©" BEGIN - MENUITEM "å³äº...", ID__ABOUT + MENUITEM "å³äº...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -21,7 +21,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS éé³æ©ï¼çæ¬ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "çæ¬ææ (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "çæ¬ææ (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "ç¢ºå®", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -29,18 +29,43 @@ BEGIN POPUP "æªæ¡" BEGIN - MENUITEM "æ°å¢", ID_NEW + MENUITEM "æ°å¢", ID_FILE_NEW MENUITEM "éå...", ID_FILE_OPEN MENUITEM "å²å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åçº...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "çµæ", ID_EXIT + MENUITEM "çµæ", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "èªªæ" BEGIN - MENUITEM "éæ¼...", ID__ABOUT + MENUITEM "éæ¼...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/resource.h [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -38,13 +38,27 @@ #define IDS_STRING406 406 #define IDS_STRCHAN 406 -#define ID_FILE_NEW 32771 -#define ID_FILE_OPEN 32772 -#define ID_FILE_SAVE 32773 -#define ID_FILE_SAVEAS 32774 -#define ID_FILE_EXIT 32775 -#define ID__ABOUT 32776 -#define ID_EXIT 32777 -#define ID_NEW 32778 +#define ID_FILE_NEW 32771 +#define ID_FILE_OPEN 32772 +#define ID_FILE_SAVE 32773 +#define ID_FILE_SAVEAS 32774 +#define ID_FILE_RESTORE 32775 +#define ID_FILE_PROPERTIES 32776 +#define ID_FILE_EXIT 32777 +#define ID_ABOUT 32778 +#define ID_EDIT_COPY 32779 +#define ID_EDIT_PASTE 32780 +#define ID_EDIT_PASTEMIX 32781 +#define ID_EDIT_INSERTFILE 32782 +#define ID_EDIT_MIXFILE 32783 +#define ID_EDIT_DELETEBEFORE 32784 +#define ID_EDIT_DELETEAFTER 32785 +#define ID_EDIT_AUDIOPROPS 32786 +#define ID_EFFECTS_INCVOL 32787 +#define ID_EFFECTS_DECVOL 32788 +#define ID_EFFECTS_INCSPD 32789 +#define ID_EFFECTS_DECSPD 32790 +#define ID_EFFECTS_ECHO 32791 +#define ID_EFFECTS_REVERSE 32792 #define IDC_STATIC -1 Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -3,6 +3,7 @@ * FILE: base/applications/sndrec32/sndrec32.cpp * PURPOSE: Sound recording * PROGRAMMERS: Marco Pagliaricci (irc: rendar) + * Robert Naumann (gonzoMD) */ #include "stdafx.h" @@ -11,6 +12,7 @@ #include <commdlg.h> #include "sndrec32.h" +#include "shellapi.h" #ifndef _UNICODE #define gprintf _snprintf @@ -537,7 +539,7 @@ switch (wmId) { - case ID_NEW: + case ID_FILE_NEW: if (!isnew) { if (AUD_IN->current_status() == snd::WAVEIN_RECORDING) @@ -599,7 +601,7 @@ InvalidateRect(hWnd, &text2_rect, TRUE); break; - case ID__ABOUT: + case ID_ABOUT: DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutDlgProc); return TRUE; break; @@ -621,11 +623,16 @@ write_wav(file_path); EnableMenuItem(GetMenu(hWnd), ID_FILE_SAVE, MF_ENABLED); } - break; - - case ID_EXIT: - DestroyWindow(hWnd); - break; + break; + + + case ID_EDIT_AUDIOPROPS: + ShellExecute( NULL, NULL, _T("rundll32.exe"), _T("shell32.dll,Control_RunDLL mmsys.cpl,ShowAudioPropertySheet"), NULL, SW_SHOWNORMAL ); + break; + + case ID_FILE_EXIT: + DestroyWindow( hWnd ); + break; /* Sndrec32 buttons routines */ case BUTSTART_ID:

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