Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[jgardou] 64440: [ADVAPI32_APITEST] - Add a few more tests for corner cases of RegCreateKeyEx API with HKCR subkeys CORE-8582

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Oct 1 17:28:45 2014 New Revision: 64440 URL: http://svn.reactos.org/svn/reactos?rev=64440&view=rev Log: [ADVAPI32_APITEST] - Add a few more tests for corner cases of RegCreateKeyEx API with HKCR subkeys CORE-8582 Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Wed Oct 1 17:28:45 2014 @@ -112,6 +112,7 @@ HKEY UserKey, UserSubKey; HKEY ClassesRootKey, ClassesRootSubKey; DWORD ErrorCode; + DWORD Disposition; /* First create a subkey in HKLM */ ErrorCode = RegCreateKeyExW( @@ -309,6 +310,24 @@ /* Verify it has opened the HKCU one */ ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKLM_HKCU"); + /* Try the same thing, but this time with RegCreateKeyEx API */ + RegCloseKey(ClassesRootKey); + ErrorCode = RegCreateKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKLM_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootKey, + &Disposition); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + /* Verify it has opened the HKCU one */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKLM_HKCU"); + ok_hex(Disposition, REG_OPENED_EXISTING_KEY); + /* Deleting it from HKCR first deletes the one in HKCU */ ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKLM_HKCU"); ok_dec(ErrorCode, ERROR_SUCCESS); @@ -374,6 +393,24 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok(IS_HKCR(ClassesRootSubKey), "\n"); ok_key_name(ClassesRootSubKey, &HKCU_ClassesPath, L"Apitest_HKLM\\HKCU_Subkey"); + + /* Try the same thing, but this time with RegCreateKeyEx API */ + RegCloseKey(ClassesRootSubKey); + ErrorCode = RegCreateKeyExW( + ClassesRootKey, + L"HKCU_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootSubKey, + &Disposition); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootSubKey), "\n"); + /* Verify it has opened the HKCU one */ + ok_key_name(ClassesRootSubKey, &HKCU_ClassesPath, L"Apitest_HKLM\\HKCU_Subkey"); + ok_hex(Disposition, REG_OPENED_EXISTING_KEY); /* This one now exists */ ErrorCode = RegOpenKeyExW( @@ -488,31 +525,49 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok(!IS_HKCR(MachineKey), "\n"); - /* Delete */ + /* Delete this subkey */ ErrorCode = RegDeleteKeyW(MachineKey, L"HKLM_Subkey"); ok_dec(ErrorCode, ERROR_SUCCESS); ok_key_deleted(MachineSubKey); ok_key_deleted(ClassesRootSubKey); - /* Rery creating a subkey with this HKCR handle (which points to HKCU). - * It should now be created in the HKLM view. */ + /* Create another subkey, this time from HKCU */ + ErrorCode = RegCreateKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCU\\HKCU_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &UserSubKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(UserSubKey), "\n"); + + /* And try creating it again as a subkey of this HKCR handle (which points to HKCU). */ ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); ErrorCode = RegCreateKeyExW( ClassesRootKey, - L"HKCR_Subkey", + L"HKCU_Subkey", 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &ClassesRootSubKey, - NULL); + &Disposition); ok_dec(ErrorCode, ERROR_SUCCESS); ok(IS_HKCR(ClassesRootSubKey), "\n"); - ok_key_name(ClassesRootSubKey, &HKLM_ClassesPath, L"Apitest_HKCU\\HKCR_Subkey"); - RegDeleteKeyW(MachineKey, L"HKCR_Subkey"); + /* This time the one in HKCU is opened */ + ok_key_name(ClassesRootSubKey, &HKCU_ClassesPath, L"Apitest_HKCU\\HKCU_Subkey"); + ok_hex(Disposition, REG_OPENED_EXISTING_KEY); + /* Let's see if we can delete it */ + RegDeleteKeyW(ClassesRootKey, L"HKCU_Subkey"); ok_key_deleted(ClassesRootSubKey); RegCloseKey(ClassesRootSubKey); + ok_key_deleted(UserSubKey); + RegCloseKey(UserSubKey); RegCloseKey(MachineSubKey); RegCloseKey(ClassesRootSubKey);

11 years

[jgardou] 64439: [ADVAPI32_APITEST] - Add more tests for HKCR subkeys creation. CORE-8582

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Oct 1 15:59:54 2014 New Revision: 64439 URL: http://svn.reactos.org/svn/reactos?rev=64439&view=rev Log: [ADVAPI32_APITEST] - Add more tests for HKCR subkeys creation. CORE-8582 Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Wed Oct 1 15:59:54 2014 @@ -432,6 +432,26 @@ ok(IS_HKCR(ClassesRootKey), "\n"); ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); + /* Try creating a subkey with this HKCR handle, which points to a subkey in HKCU. */ + ErrorCode = RegCreateKeyExW( + ClassesRootKey, + L"HKCR_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootSubKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootSubKey), "\n"); + /* It is in fact created in HKLM */ + ok_key_name(ClassesRootSubKey, &HKLM_ClassesPath, L"Apitest_HKCU\\HKCR_Subkey"); + /* Let's see if we can delete it */ + RegDeleteKeyW(ClassesRootKey, L"HKCR_Subkey"); + ok_key_deleted(ClassesRootSubKey); + RegCloseKey(ClassesRootSubKey); + /* Create a corresponding subkey in HKLM */ ErrorCode = RegCreateKeyExW( HKEY_LOCAL_MACHINE, @@ -446,7 +466,8 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok(!IS_HKCR(MachineSubKey), "\n"); - /* Open it as an HKCR subkey */ + /* Open it from the HKCR handle (which is still pointing to HKCU) */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); ErrorCode = RegOpenKeyExW( ClassesRootKey, L"HKLM_Subkey", @@ -472,6 +493,27 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok_key_deleted(MachineSubKey); ok_key_deleted(ClassesRootSubKey); + + /* Rery creating a subkey with this HKCR handle (which points to HKCU). + * It should now be created in the HKLM view. */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); + ErrorCode = RegCreateKeyExW( + ClassesRootKey, + L"HKCR_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootSubKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootSubKey), "\n"); + ok_key_name(ClassesRootSubKey, &HKLM_ClassesPath, L"Apitest_HKCU\\HKCR_Subkey"); + RegDeleteKeyW(MachineKey, L"HKCR_Subkey"); + ok_key_deleted(ClassesRootSubKey); + RegCloseKey(ClassesRootSubKey); + RegCloseKey(MachineSubKey); RegCloseKey(ClassesRootSubKey);

11 years

[tfaber] 64438: [WINE:TEST.H] - Correctly count broken and win_skip (depending on USE_WINE_TODOS) when WINETEST_PLATFORM=reactos

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Oct 1 14:16:18 2014 New Revision: 64438 URL: http://svn.reactos.org/svn/reactos?rev=64438&view=rev Log: [WINE:TEST.H] - Correctly count broken and win_skip (depending on USE_WINE_TODOS) when WINETEST_PLATFORM=reactos Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Wed Oct 1 14:16:18 2014 @@ -306,7 +306,11 @@ int broken( int condition ) { - return (strcmp(winetest_platform, "windows") == 0) && condition; + return ((strcmp(winetest_platform, "windows") == 0) +#ifndef USE_WINE_TODOS + || (strcmp(winetest_platform, "reactos") == 0) +#endif + ) && condition; } /* @@ -411,7 +415,11 @@ { __winetest_va_list valist; __winetest_va_start(valist, msg); - if ((strcmp(winetest_platform, "windows") == 0) || (strcmp(winetest_platform, "reactos") == 0)) + if ((strcmp(winetest_platform, "windows") == 0) +#ifndef USE_WINE_TODOS + || (strcmp(winetest_platform, "reactos") == 0) +#endif + ) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist);

11 years

[akhaldi] 64437: [HNETCFG][OLEACC][WBEMDISP] * Add missing stdole2 dependency. Spotted by Thomas Kriese. CORE-8585 #resolve #comment Fixed in r64437. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 1 11:12:48 2014 New Revision: 64437 URL: http://svn.reactos.org/svn/reactos?rev=64437&view=rev Log: [HNETCFG][OLEACC][WBEMDISP] * Add missing stdole2 dependency. Spotted by Thomas Kriese. CORE-8585 #resolve #comment Fixed in r64437. Thanks! Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:12:48 2014 @@ -27,6 +27,7 @@ set_source_files_properties(hnetcfg.rc PROPERTIES OBJECT_DEPENDS "${hnetcfg_rc_deps}") set_module_type(hnetcfg win32dll) +add_dependencies(hnetcfg stdole2) target_link_libraries(hnetcfg wine uuid) add_importlibs(hnetcfg ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_pch(hnetcfg hnetcfg_private.h SOURCE) Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:12:48 2014 @@ -17,6 +17,7 @@ set_source_files_properties(oleacc.rc PROPERTIES OBJECT_DEPENDS "${oleacc_rc_deps}") add_library(oleacc SHARED ${SOURCE} oleacc.rc) +add_dependencies(oleacc stdole2) set_module_type(oleacc win32dll) target_link_libraries(oleacc wine) add_importlibs(oleacc user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:12:48 2014 @@ -26,7 +26,7 @@ set_module_type(wbemdisp win32dll) target_link_libraries(wbemdisp uuid wine) -add_dependencies(wbemdisp wbemdisp_idlheader) +add_dependencies(wbemdisp stdole2 wbemdisp_idlheader) add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll) add_pch(wbemdisp wbemdisp_private.h SOURCE) add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)

11 years

[akhaldi] 64436: [ITSS] * Add missing wineheaders dependency. Spotted by Thomas Kriese. CORE-8586 #resolve #comment Fixed in r64436. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 1 11:07:06 2014 New Revision: 64436 URL: http://svn.reactos.org/svn/reactos?rev=64436&view=rev Log: [ITSS] * Add missing wineheaders dependency. Spotted by Thomas Kriese. CORE-8586 #resolve #comment Fixed in r64436. Thanks! Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:07:06 2014 @@ -24,4 +24,5 @@ target_link_libraries(itss uuid wine) add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll) add_pch(itss precomp.h SOURCE) +add_dependencies(itss wineheaders) add_cd_file(TARGET itss DESTINATION reactos/system32 FOR all)

11 years

[akhaldi] 64435: [DX10GUID] * Add missing d3d_idl_headers dependency. Spotted by Thomas Kriese. CORE-8588 #resolve #comment Fixed in r64434. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 1 11:03:51 2014 New Revision: 64435 URL: http://svn.reactos.org/svn/reactos?rev=64435&view=rev Log: [DX10GUID] * Add missing d3d_idl_headers dependency. Spotted by Thomas Kriese. CORE-8588 #resolve #comment Fixed in r64434. Thanks! Modified: trunk/reactos/lib/sdk/dxguid/CMakeLists.txt Modified: trunk/reactos/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/CMakeLists.… ============================================================================== --- trunk/reactos/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:03:51 2014 @@ -3,4 +3,4 @@ add_library(dx10guid dx10guid.c) add_dependencies(dxguid psdk) -add_dependencies(dx10guid psdk) +add_dependencies(dx10guid psdk d3d_idl_headers)

11 years

[akhaldi] 64434: [MSADP32.ACM] * Delete this duplicate.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 1 11:00:12 2014 New Revision: 64434 URL: http://svn.reactos.org/svn/reactos?rev=64434&view=rev Log: [MSADP32.ACM] * Delete this duplicate. Removed: trunk/reactos/dll/win32/msacm32/msadp32/

11 years

[akhaldi] 64433: [PSDK] * Add a header guard.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 1 10:41:22 2014 New Revision: 64433 URL: http://svn.reactos.org/svn/reactos?rev=64433&view=rev Log: [PSDK] * Add a header guard. Modified: trunk/reactos/include/psdk/msacmdlg.h Modified: trunk/reactos/include/psdk/msacmdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msacmdlg.h?re… ============================================================================== --- trunk/reactos/include/psdk/msacmdlg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msacmdlg.h [iso-8859-1] Wed Oct 1 10:41:22 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define DLG_ACMFORMATCHOOSE_ID 70 #define IDD_ACMFORMATCHOOSE_BTN_HELP 9 #define IDD_ACMFORMATCHOOSE_CMB_CUSTOM 100 @@ -33,4 +35,3 @@ #define IDD_ACMFILTERCHOOSE_CMB_FILTER 102 #define IDD_ACMFILTERCHOOSE_BTN_SETNAME 103 #define IDD_ACMFILTERCHOOSE_BTN_DELNAME 104 -

11 years

[akhaldi] 64432: [MSACM32] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 1 10:36:12 2014 New Revision: 64432 URL: http://svn.reactos.org/svn/reactos?rev=64432&view=rev Log: [MSACM32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc trunk/reactos/dll/win32/msacm32/lang/msacm_El.rc trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Sq.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc trunk/reactos/dll/win32/msacm32/msacm.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -15,6 +15,7 @@ add_library(msacm32 SHARED ${SOURCE} + msacm.rc ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE) Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Bg.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Èçáîð íà çâóê" FONT 8, "MS Shell Dlg" @@ -28,29 +28,24 @@ LTEXT "&Èìå:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Ñúõðàíÿâàíå êàòî...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Ïðå&ìàõâàíå", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Ñúõðàíÿâàíå êàòî...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "Ïðå&ìàõâàíå", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Ôîðìàò:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Ôîðìàò:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ïðèíàäëåæíîñòè", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Ïðèíàäëåæíîñòè", -1, 5, 76, 44, 8, NOT WS_GROUP -#if 0 - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | - CBS_OWNERDRAWFIXED | CBS_HASSTRINGS -#else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -#endif - DEFPUSHBUTTON "Äîáðå", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Ïîìî&ù", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + + PUSHBUTTON "Ïîìî&ù", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "Äîáðå", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Îòêàç", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Cs.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -24,7 +24,7 @@ /* Czech strings in CP1250 */ -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Výbìr zvuku" FONT 8, "MS Shell Dlg" @@ -32,24 +32,24 @@ LTEXT "&Název:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Uloit jako", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Odeb&rat", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Uloit jako", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "Odeb&rat", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formát:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formát:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Atributy:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Atributy:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Storno", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "P&omoc", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "P&omoc", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Da.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Lyd valg" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Navn:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Gem &som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Fje&rn", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "Gem &som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "Fje&rn", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attributter:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attributter:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annuller", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hjælp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Hjælp", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Annuller", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_De.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -22,7 +22,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Soundauswahl" FONT 8, "MS Shell Dlg" @@ -30,24 +30,24 @@ LTEXT "&Name:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Speichern &unter...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Entfernen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "Speichern &unter...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Entfernen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attribute:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attribute:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hilfe", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Hilfe", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_El.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -15,12 +15,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÅðéëïãÞ Þ÷ïõ" FONT 8, "MS Shell Dlg" @@ -28,29 +28,24 @@ LTEXT "&¼íïìá:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&ÁðïèÞêåõóç ùò...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Áöáßñåóç", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&ÁðïèÞêåõóç ùò...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Áöáßñåóç", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&ÖïñìÜ:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&ÖïñìÜ:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Éäéüôçôåò:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Éäéüôçôåò:", -1, 5, 76, 44, 8, NOT WS_GROUP -#if 0 - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | - CBS_OWNERDRAWFIXED | CBS_HASSTRINGS -#else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -#endif - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "¢êõñï", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&ÂïÞèåéá", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + + PUSHBUTTON "&ÂïÞèåéá", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_En.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sound Selection" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Name:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Save As...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Remove", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Save As...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Remove", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attributes:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attributes:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancel", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Help", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Help", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Es.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Selección de sonido" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Nombre:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Guardar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Eliminar", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Guardar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Eliminar", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formato:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "A&tributos:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "A&tributos:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Aceptar", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Ayuda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Ayuda", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Fr.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -25,7 +25,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 250, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "SÃ©lection du son" FONT 8, "MS Shell Dlg" @@ -33,24 +33,24 @@ LTEXT "&Nom :", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 15, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 70, 14 - PUSHBUTTON "&Supprimer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 199, 14, 45, 14 + PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Supprimer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format :", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format :", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 48, 39, 197, 15, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attributs :", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attributs :", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 48, 57, 197, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annuler", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Aid&e", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "Aid&e", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_He.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -25,7 +25,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "××××¨×ª ×©××¢" FONT 8, "MS Shell Dlg" @@ -33,24 +33,24 @@ LTEXT "×©×:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "×©×××¨× ××©×...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "××¡×¨", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "×©×××¨× ××©×...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "××¡×¨", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "×¤××¨××:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "×¤××¨××:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "×××¤××× ××:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "×××¤××× ××:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "×××©××¨", IDOK, 48, 80, 40, 14 - PUSHBUTTON "×××××", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "×¢××¨×", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "×¢××¨×", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "×××©××¨", IDOK, 115, 100, 50, 14 + PUSHBUTTON "×××××", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Hu.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hang kiválasztás" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Név:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Mentés másként...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Eltávolítás", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Mentés másként...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Eltávolítás", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formátum:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formátum:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attribútumok:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attribútumok:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Mégse", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Súgó", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Súgó", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_It.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -21,7 +21,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Selezione dell'audio" FONT 8, "MS Shell Dlg" @@ -29,24 +29,24 @@ LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Salva con nome...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Rimuovi", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Salva con nome...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Rimuovi", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formato:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attributi:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attributi:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annulla", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Aiuto", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Aiuto", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ja.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -23,7 +23,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ãµã¦ã³ãã®é¸æ" FONT 9, "MS Shell Dlg" @@ -31,24 +31,24 @@ LTEXT "åå(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ååãä»ãã¦ä¿å(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "åé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "ååãä»ãã¦ä¿å(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "åé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "ãã©ã¼ããã(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "ãã©ã¼ããã(&F):", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "å±æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "å±æ§(&A):", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "ãã«ã(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "ãã«ã(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ko.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "»ç¿îµå ¼±ÅÃ" FONT 9, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "ÀÌ¸§(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 97, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 103, 14, 70, 14 - PUSHBUTTON "Á¦°Å(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "Á¦°Å(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "Çü½Ä(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "Çü½Ä(&F):", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "¼Ó¼º(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "¼Ó¼º(&A):", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "È®ÀÎ", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "µµ¿ò¸»(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "µµ¿ò¸»(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Lt.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -23,7 +23,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Garso parinkimas" FONT 8, "MS Shell Dlg" @@ -31,24 +31,24 @@ LTEXT "&Pavadinimas:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 100, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "IÅ¡saugoti k&aip...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 110, 14, 60, 14 - PUSHBUTTON "Pa&Å¡alinti", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "IÅ¡saugoti k&aip...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "Pa&Å¡alinti", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formatas:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formatas:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "A&tributai:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "A&tributai:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Gerai", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Atsisakyti", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Å½inynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Å½inynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "Gerai", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Atsisakyti", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Nl.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Geluidskeuze" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Naam:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Opslaan als...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Verwijderen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Opslaan als...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Verwijderen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formaat:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formaat:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attributen:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attributen:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Annuleren", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Help", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Help", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_No.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Lydutvalg" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Navn:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Lagre &som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "Fje&rn", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "Lagre &som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "Fje&rn", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attributter:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attributter:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hjelp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Hjelp", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pl.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -21,7 +21,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 235, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wybór d¿wiêku" FONT 8, "MS Shell Dlg" @@ -29,24 +29,24 @@ LTEXT "&Nazwa:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Zapisz jako...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 50, 14 - PUSHBUTTON "&Usuñ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 180, 14, 50, 14 + PUSHBUTTON "&Zapisz jako...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Usuñ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 180, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Atrybuty:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Atrybuty:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 180, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 53, 80, 40, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 97, 80, 40, 14 - PUSHBUTTON "&Pomoc", IDD_ACMFORMATCHOOSE_BTN_HELP, 141, 80, 40, 14 + PUSHBUTTON "&Pomoc", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Pt.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -24,7 +24,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "SeleÃ§Ã£o de som" FONT 8, "MS Shell Dlg" @@ -32,31 +32,31 @@ LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Salvar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Salvar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formato:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Atributos:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Atributos:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 170, 100, 50, 14 END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "SelecÃ§Ã£o de som" FONT 8, "MS Shell Dlg" @@ -64,24 +64,24 @@ LTEXT "&Nome:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Gravar como...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Remover", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formato:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formato:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Atributos:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Atributos:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "Aj&uda", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ro.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -22,32 +22,32 @@ #pragma code_page(65001) -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "SelecÈie sunet" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "N&ume:", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "N&ume:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "PÄ&strare caâ¦", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&EliminÄ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "PÄ&strare caâ¦", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&EliminÄ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "F&ormat:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "F&ormat:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Atribute:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Atribute:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Con&firmÄ", IDOK, 48, 80, 40, 14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Manualâ¦", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Manualâ¦", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 115, 100, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Ru.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -23,7 +23,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÑÐ±Ð¾Ñ Ð·Ð²ÑÐºÐ°" FONT 8, "MS Shell Dlg" @@ -31,24 +31,24 @@ LTEXT "&ÐÐ¼Ñ:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&ÐÐ¾Ð¼Ð¾ÑÑ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&ÐÐ¾Ð¼Ð¾ÑÑ", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Si.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -22,7 +22,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Izbira zvoka" FONT 8, "MS Shell Dlg" @@ -30,24 +30,24 @@ LTEXT "&Ime:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Shrani kot ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Odstrani", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Shrani kot ...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Odstrani", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Lastnosti:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Lastnosti:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "V redu", IDOK, 48, 80, 40, 14 - PUSHBUTTON "PrekliÄi", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&PomoÄ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&PomoÄ", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "V redu", IDOK, 115, 100, 50, 14 + PUSHBUTTON "PrekliÄi", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Sq.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PÃ«rzgjedhja ZÃ«rit" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Emri:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Ruaj Si...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Hiq", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Ruaj Si...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Hiq", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Formati:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Formati:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Atributet:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Atributet:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Anulo", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&NdihmÃ«", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&NdihmÃ«", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Sv.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ljudval" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Namn:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Spara som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Ta bort", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Spara som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Ta bort", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Format:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Attribut:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Attribut:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&Hjälp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&Hjälp", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ses SeÃ§me" FONT 8, "MS Shell Dlg" @@ -28,24 +28,24 @@ LTEXT "&Ad:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ay&rÄ± Sakla...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&KaldÄ±r", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "Ay&rÄ± Sakla...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&KaldÄ±r", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&BiÃ§im:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&BiÃ§im:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ãz Nitelikler:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Ãz Nitelikler:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Tamam", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ä°ptal", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&YardÄ±m", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&YardÄ±m", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "Tamam", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Uk.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -23,7 +23,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sound Selection" FONT 8, "MS Shell Dlg" @@ -31,24 +31,24 @@ LTEXT "&ÐÐ¼'Ñ:", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ &ÑÐº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ &ÑÐº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ:", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&ÐÐ¾Ð²ÑÐ´ÐºÐ°", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "&ÐÐ¾Ð²ÑÐ´ÐºÐ°", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 115, 100, 50, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… ============================================================================== --- trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/lang/msacm_Zh.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -23,7 +23,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "å£°é³éæ©" FONT 9, "MS Shell Dlg" @@ -31,31 +31,31 @@ LTEXT "åç§°(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "ä¿åä¸º(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "å é¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "ä¿åä¸º(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "å é¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "æ ¼å¼(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "æ ¼å¼(&F):", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "å±æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "å±æ§(&A):", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "ç¡®å®", IDOK, 48, 80, 40, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "å¸®å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "å¸®å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "ç¡®å®", IDOK, 115, 100, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 170, 100, 50, 14 END LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è²é³é¸æ" FONT 9, "MS Shell Dlg" @@ -63,24 +63,24 @@ LTEXT "åç¨±(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "å²åçº(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "åªé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "å²åçº(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "åªé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 - LTEXT "æ ¼å¼(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "æ ¼å¼(&F):", -1, 5, 56, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 54, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "å±¬æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "å±¬æ§(&A):", -1, 5, 76, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 74, 170, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "ç¢ºå®", IDOK, 48, 80, 40, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "å¹«å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "å¹«å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 5, 100, 50, 14 + DEFPUSHBUTTON "ç¢ºå®", IDOK, 115, 100, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 170, 100, 50, 14 END Modified: trunk/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.rc… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm.rc [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wineacm.h" +#include <windef.h> +#include <winuser.h> +#include <msacmdlg.h> #ifdef LANGUAGE_BG_BG #include "lang/msacm_Bg.rc" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 1 10:36:12 2014 @@ -111,7 +111,7 @@ reactos/dll/win32/mmdevapi # Synced to Wine-1.7.27 reactos/dll/win32/mpr # Synced to Wine-1.7.27 reactos/dll/win32/mprapi # Synced to Wine-1.7.17 -reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 +reactos/dll/win32/msacm32 # Synced to Wine-1.7.27 reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17 reactos/dll/win32/msadp32.acm # Synced to Wine-1.7.17 reactos/dll/win32/mscat32 # Synced to Wine-1.7.17

11 years

[hbelusca] 64431: [NTVDM] The highest bit of the mode number is used to determine whether or not we need to clear the screen. Fix the existing code that was disabled in revision 61907 because it wa...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 1 00:40:36 2014 New Revision: 64431 URL: http://svn.reactos.org/svn/reactos?rev=64431&view=rev Log: [NTVDM] The highest bit of the mode number is used to determine whether or not we need to clear the screen. Fix the existing code that was disabled in revision 61907 because it was completely wrong. Now we correctly support this feature. Also check the mode number limit and fail if it is unsupported. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Wed Oct 1 00:40:36 2014 @@ -1003,11 +1003,23 @@ static BOOLEAN VidBiosSetVideoMode(BYTE ModeNumber) { BYTE Page; - COORD Resolution; - PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; - - DPRINT1("Switching to mode %Xh; VgaMode = 0x%p\n", ModeNumber, VgaMode); + BOOLEAN DoNotClear = !!(ModeNumber & 0x80); + PVGA_REGISTERS VgaMode; + + /* Retrieve the real mode number and check its validity */ + ModeNumber &= 0x7F; + // if (ModeNumber >= sizeof(VideoModes)/sizeof(VideoModes[0])) + if (ModeNumber > BIOS_MAX_VIDEO_MODE) + { + DPRINT1("VidBiosSetVideoMode -- Mode %02Xh invalid\n", ModeNumber); + return FALSE; + } + + VgaMode = VideoModes[ModeNumber]; + + DPRINT1("Switching to mode %02Xh %s clearing the screen; VgaMode = 0x%p\n", + ModeNumber, (DoNotClear ? "without" : "and"), VgaMode); if (!VgaSetRegisters(VgaMode)) return FALSE; @@ -1019,8 +1031,7 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-0069.htm * for more information. */ - // if ((ModeNumber & 0x08) == 0) VgaClearMemory(); - VgaClearMemory(); + if (!DoNotClear) VgaClearMemory(); // Bda->CrtModeControl; // Bda->CrtColorPaletteMask;

11 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014