Author: akhaldi Date: Sat Sep 28 15:20:19 2013 New Revision: 60424
URL: http://svn.reactos.org/svn/reactos?rev=60424&view=rev Log: [WINEMP3.ACM] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt trunk/reactos/dll/win32/winemp3.acm/mpegl3.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMake... ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:20:19 2013 @@ -16,13 +16,5 @@ set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) - -add_importlibs(winemp3.acm - winmm - user32 - msvcrt - kernel32 - ntdll) - -add_dependencies(winemp3.acm psdk) +add_importlibs(winemp3.acm winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpegl... ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/mpegl3.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/mpegl3.c [iso-8859-1] Sat Sep 28 15:20:19 2013 @@ -700,7 +700,7 @@ aftd->dwFormatTagIndex = 2; /* WAVE_FORMAT_MPEG is biggest */ break; } - /* fall thru */ + /* fall through */ case ACM_FORMATTAGDETAILSF_FORMATTAG: switch (aftd->dwFormatTag) {
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:20:19 2013 @@ -200,7 +200,7 @@ reactos/dll/win32/wbemprox # Synced to Wine-1.7.1 reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Synced to Wine-1.7.1 -reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.19 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.1 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to Wine-1.5.26 reactos/dll/win32/wininet # Synced to Wine-1.5.26