From 0f76bdfc048d21d8de1823dedc5da33d4292e6bd Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 28 Sep 2013 15:20:19 +0000 Subject: [PATCH] [WINEMP3.ACM] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60424 --- reactos/dll/win32/winemp3.acm/CMakeLists.txt | 10 +--------- reactos/dll/win32/winemp3.acm/mpegl3.c | 2 +- reactos/media/doc/README.WINE | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/reactos/dll/win32/winemp3.acm/CMakeLists.txt b/reactos/dll/win32/winemp3.acm/CMakeLists.txt index cc01f2a63ca..7002521334d 100644 --- a/reactos/dll/win32/winemp3.acm/CMakeLists.txt +++ b/reactos/dll/win32/winemp3.acm/CMakeLists.txt @@ -16,13 +16,5 @@ add_library(winemp3.acm SHARED 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) diff --git a/reactos/dll/win32/winemp3.acm/mpegl3.c b/reactos/dll/win32/winemp3.acm/mpegl3.c index c8ef9dc3867..345d8ae8cb9 100644 --- a/reactos/dll/win32/winemp3.acm/mpegl3.c +++ b/reactos/dll/win32/winemp3.acm/mpegl3.c @@ -700,7 +700,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTagIndex = 2; /* WAVE_FORMAT_MPEG is biggest */ break; } - /* fall thru */ + /* fall through */ case ACM_FORMATTAGDETAILSF_FORMATTAG: switch (aftd->dwFormatTag) { diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3c84fd526aa..088c5bac07d 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -200,7 +200,7 @@ reactos/dll/win32/version # Autosync 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