[MSACM32] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 18 Mar 2018 11:20:12 +0000 (12:20 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 18 Mar 2018 11:20:37 +0000 (12:20 +0100)
12 files changed:
dll/win32/msacm32/CMakeLists.txt
dll/win32/msacm32/driver.c
dll/win32/msacm32/filter.c
dll/win32/msacm32/format.c
dll/win32/msacm32/internal.c
dll/win32/msacm32/msacm.rc
dll/win32/msacm32/msacm32_main.c
dll/win32/msacm32/pcmconverter.c
dll/win32/msacm32/precomp.h [new file with mode: 0644]
dll/win32/msacm32/stream.c
dll/win32/msacm32/wineacm.h
media/doc/README.WINE

index 9be8925..88a5830 100644 (file)
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     msacm32_main.c
     pcmconverter.c
     stream.c
-    wineacm.h
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
 
 add_library(msacm32 SHARED
@@ -21,5 +21,5 @@ add_library(msacm32 SHARED
 set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
 target_link_libraries(msacm32 wine)
 add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
-add_pch(msacm32 wineacm.h SOURCE)
+add_pch(msacm32 precomp.h SOURCE)
 add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
index 778a598..e0c5fdd 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           acmDriverAddA (MSACM32.@)
index 4f21bc8..53db827 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           acmFilterChooseA (MSACM32.@)
index 9535f20..b3d2900 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
 struct MSACM_FillFormatData {
     HWND               hWnd;
 #define WINE_ACMFF_TAG         0
index 6550f4c..7bafcaa 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
-#include <winreg.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**********************************************************************/
 
index f26f474..f72be33 100644 (file)
  *
  * 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
  */
 
-#include <windef.h>
-#include <winuser.h>
-#include <msacmdlg.h>
+#include "wineacm.h"
+
 
 #include <reactos/manifest_dll.rc>
 
index ae362f2..efe58af 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
 /**********************************************************************/
 
 HINSTANCE      MSACM_hInstance32 = 0;
index 61a1b35..d52662a 100644 (file)
  *       embedded driver handling scheme in msacm32.dll which isn't done yet
  */
 
-#include "wineacm.h"
+#include "config.h"
 
 #include <assert.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "wingdi.h"
+#include "winnls.h"
+#include "winuser.h"
+
+#include "msacmdrv.h"
+#include "wineacm.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
 
 /***********************************************************************
  *           PCM_drvOpen
diff --git a/dll/win32/msacm32/precomp.h b/dll/win32/msacm32/precomp.h
new file mode 100644 (file)
index 0000000..dae5033
--- /dev/null
@@ -0,0 +1,17 @@
+
+#ifndef _WINEACM_PRECOMP_H
+#define _WINEACM_PRECOMP_H
+
+#include <wine/config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define NOBITMAP
+
+#include "wineacm.h"
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#endif /* !_WINEACM_PRECOMP_H */
index a938d80..e06503a 100644 (file)
  *     + properly close ACM streams
  */
 
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "mmsystem.h"
+#define NOBITMAP
+#include "mmreg.h"
+#include "msacm.h"
+#include "msacmdrv.h"
 #include "wineacm.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+
 static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has)
 {
     TRACE("(%p)\n", has);
index 11dea6e..37d639d 100644 (file)
 #ifndef __WINE_WINEACM_H
 #define __WINE_WINEACM_H
 
-#include <wine/config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define NOBITMAP
-
 #include <windef.h>
 #include <winuser.h>
-
-#include <wine/debug.h>
+#ifdef __REACTOS__
 #include <wine/msacmdrv.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msacm);
+#endif
 
 /***********************************************************************
  * Wine specific - Win32
@@ -162,6 +152,6 @@ LRESULT CALLBACK    PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
                                       LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN;
 
 /* Dialog box templates */
-#include <msacmdlg.h>
+#include "msacmdlg.h"
 
 #endif /* __WINE_WINEACM_H */
index 442dd6d..92d7b24 100644 (file)
@@ -100,7 +100,7 @@ reactos/dll/win32/mlang               # Synced to WineStaging-3.3
 reactos/dll/win32/mmdevapi            # Synced to WineStaging-3.3
 reactos/dll/win32/mpr                 # Synced to WineStaging-3.3
 reactos/dll/win32/mprapi              # Synced to WineStaging-3.3
-reactos/dll/win32/msacm32             # Synced to WineStaging-2.16
+reactos/dll/win32/msacm32             # Synced to WineStaging-3.3
 reactos/dll/win32/msacm32.drv         # Synced to WineStaging-2.9
 reactos/dll/win32/msadp32.acm         # Synced to WineStaging-2.9
 reactos/dll/win32/mscat32             # Synced to WineStaging-2.9