Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [MSGSM32.ACM] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c994d6438c218338bf373… commit c994d6438c218338bf373373fcc0217d688f4c7b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:31:18 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:31:18 2018 +0100 [MSGSM32.ACM] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msgsm32.acm/msgsm32.c | 32 +++++++++++++++----------------- media/doc/README.WINE | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dll/win32/msgsm32.acm/msgsm32.c b/dll/win32/msgsm32.acm/msgsm32.c index 4a8f100972..cce1303455 100644 --- a/dll/win32/msgsm32.acm/msgsm32.c +++ b/dll/win32/msgsm32.acm/msgsm32.c @@ -20,14 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS +#include "config.h" +#include <wine/port.h> -#include <config.h> -//#include <wine/port.h> - -//#include <assert.h> +#include <assert.h> #include <stdarg.h> -//#include <string.h> +#include <string.h> #ifdef HAVE_GSM_GSM_H #include <gsm/gsm.h> @@ -35,17 +33,17 @@ #include <gsm.h> #endif -#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 "wine/library.h" -#include <wine/debug.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 "wine/library.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gsm); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index b05e2f67ad..2f006c5934 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -109,7 +109,7 @@ reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-3.3 reactos/dll/win32/msftedit # Synced to WineStaging-3.3 reactos/dll/win32/msg711.acm # Synced to WineStaging-3.3 -reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-3.3

7 years

01/01: [MSG711.ACM] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff71b0673f7e4247ff630… commit ff71b0673f7e4247ff630d3cb419e4b89780ac21 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:30:33 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:30:33 2018 +0100 [MSG711.ACM] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msg711.acm/msg711.c | 24 +++++++++++------------- media/doc/README.WINE | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dll/win32/msg711.acm/msg711.c b/dll/win32/msg711.acm/msg711.c index a12bd09965..dc1661c7db 100644 --- a/dll/win32/msg711.acm/msg711.c +++ b/dll/win32/msg711.acm/msg711.c @@ -19,21 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <assert.h> #include <stdarg.h> -//#include <string.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 <wine/debug.h> +#include <string.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 "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(g711); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 60b2a875a1..b05e2f67ad 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -108,7 +108,7 @@ reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-3.3 reactos/dll/win32/msftedit # Synced to WineStaging-3.3 -reactos/dll/win32/msg711.acm # Synced to WineStaging-2.9 +reactos/dll/win32/msg711.acm # Synced to WineStaging-3.3 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55

7 years

01/01: [MSFTEDIT] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e99b3f17cdf97abea8af… commit 7e99b3f17cdf97abea8afbe1388dd8fc1b9e3ced Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:29:15 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:29:15 2018 +0100 [MSFTEDIT] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msftedit/msftedit_main.c | 32 ++++++++++++++------------------ media/doc/README.WINE | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dll/win32/msftedit/msftedit_main.c b/dll/win32/msftedit/msftedit_main.c index f5ce8a970a..b505999cda 100644 --- a/dll/win32/msftedit/msftedit_main.c +++ b/dll/win32/msftedit/msftedit_main.c @@ -19,28 +19,24 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" +#include "config.h" +#include "wine/port.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <wingdi.h> -#include <winuser.h> -#include <richedit.h> -#include <imm.h> -#include <shlwapi.h> -#include <oleidl.h> -#include <initguid.h> -#include <textserv.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" +#include "richedit.h" +#include "imm.h" +#include "shlwapi.h" +#include "oleidl.h" +#include "initguid.h" +#include "textserv.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msftedit); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 1b709e7ab7..60b2a875a1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -107,7 +107,7 @@ reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-3.3 -reactos/dll/win32/msftedit # Synced to WineStaging-2.9 +reactos/dll/win32/msftedit # Synced to WineStaging-3.3 reactos/dll/win32/msg711.acm # Synced to WineStaging-2.9 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55

7 years

01/01: [MSCTF] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=897e19b0a601825de1584… commit 897e19b0a601825de158462eef9c5d3142346761 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:28:32 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:28:32 2018 +0100 [MSCTF] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msctf/CMakeLists.txt | 4 ++-- dll/win32/msctf/categorymgr.c | 20 ++++++++++++++++++++ dll/win32/msctf/compartmentmgr.c | 22 +++++++++++++++++++++- dll/win32/msctf/context.c | 21 +++++++++++++++++++++ dll/win32/msctf/displayattributemgr.c | 10 ++++++++++ dll/win32/msctf/documentmgr.c | 20 ++++++++++++++++++++ dll/win32/msctf/inputprocessor.c | 21 +++++++++++++++++++++ dll/win32/msctf/langbarmgr.c | 10 ++++++++++ dll/win32/msctf/msctf.c | 22 ++++++++++++++++++++-- dll/win32/msctf/msctf_internal.h | 24 +----------------------- dll/win32/msctf/precomp.h | 29 +++++++++++++++++++++++++++++ dll/win32/msctf/range.c | 20 ++++++++++++++++++++ dll/win32/msctf/threadmgr.c | 21 +++++++++++++++++++++ dll/win32/msctf/version.rc | 2 +- media/doc/README.WINE | 2 +- 15 files changed, 218 insertions(+), 30 deletions(-) diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt index 3296ee5aa5..02e172ac43 100644 --- a/dll/win32/msctf/CMakeLists.txt +++ b/dll/win32/msctf/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND SOURCE msctf.c range.c threadmgr.c - msctf_internal.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c) add_library(msctf SHARED @@ -28,5 +28,5 @@ add_library(msctf SHARED set_module_type(msctf win32dll) target_link_libraries(msctf uuid wine) add_importlibs(msctf ole32 oleaut32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) -add_pch(msctf msctf_internal.h SOURCE) +add_pch(msctf precomp.h SOURCE) add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msctf/categorymgr.c b/dll/win32/msctf/categorymgr.c index 509494fd0e..ad43833d62 100644 --- a/dll/win32/msctf/categorymgr.c +++ b/dll/win32/msctf/categorymgr.c @@ -18,8 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagCategoryMgr { ITfCategoryMgr ITfCategoryMgr_iface; LONG refCount; diff --git a/dll/win32/msctf/compartmentmgr.c b/dll/win32/msctf/compartmentmgr.c index f0017f8e5a..4fe7b82f94 100644 --- a/dll/win32/msctf/compartmentmgr.c +++ b/dll/win32/msctf/compartmentmgr.c @@ -18,9 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" -#include <oleauto.h> +WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagCompartmentValue { struct list entry; diff --git a/dll/win32/msctf/context.c b/dll/win32/msctf/context.c index 9af5389f83..54052f6302 100644 --- a/dll/win32/msctf/context.c +++ b/dll/win32/msctf/context.c @@ -18,8 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; diff --git a/dll/win32/msctf/displayattributemgr.c b/dll/win32/msctf/displayattributemgr.c index 4c3e1aa7e6..c8bb71e2ce 100644 --- a/dll/win32/msctf/displayattributemgr.c +++ b/dll/win32/msctf/displayattributemgr.c @@ -18,8 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagDisplayAttributeMgr { ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface; diff --git a/dll/win32/msctf/documentmgr.c b/dll/win32/msctf/documentmgr.c index a764cdd85d..cf4c601cff 100644 --- a/dll/win32/msctf/documentmgr.c +++ b/dll/win32/msctf/documentmgr.c @@ -18,8 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagDocumentMgr { ITfDocumentMgr ITfDocumentMgr_iface; ITfSource ITfSource_iface; diff --git a/dll/win32/msctf/inputprocessor.c b/dll/win32/msctf/inputprocessor.c index f744d63752..fdeba38b37 100644 --- a/dll/win32/msctf/inputprocessor.c +++ b/dll/win32/msctf/inputprocessor.c @@ -18,8 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0}; static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; diff --git a/dll/win32/msctf/langbarmgr.c b/dll/win32/msctf/langbarmgr.c index 6b54ea9dea..f56c130caa 100644 --- a/dll/win32/msctf/langbarmgr.c +++ b/dll/win32/msctf/langbarmgr.c @@ -18,8 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagLangBarMgr { ITfLangBarMgr ITfLangBarMgr_iface; diff --git a/dll/win32/msctf/msctf.c b/dll/win32/msctf/msctf.c index c9c1d6a743..a19eaa1d33 100644 --- a/dll/win32/msctf/msctf.c +++ b/dll/win32/msctf/msctf.c @@ -18,10 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" +#include "shlguid.h" +#include "comcat.h" +#include "olectl.h" +#include "rpcproxy.h" +#include "msctf.h" +#include "inputscope.h" + #include "msctf_internal.h" -#include <rpcproxy.h> -#include <inputscope.h> +WINE_DEFAULT_DEBUG_CHANNEL(msctf); static HINSTANCE MSCTF_hinstance; diff --git a/dll/win32/msctf/msctf_internal.h b/dll/win32/msctf/msctf_internal.h index 09c9a34684..d5e7fe0d03 100644 --- a/dll/win32/msctf/msctf_internal.h +++ b/dll/win32/msctf/msctf_internal.h @@ -21,29 +21,7 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H -#include <wine/config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> -#include <olectl.h> -#include <msctf.h> -#include <shlwapi.h> - -#include <wine/list.h> -#include <wine/unicode.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msctf); +#include "wine/list.h" #define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 diff --git a/dll/win32/msctf/precomp.h b/dll/win32/msctf/precomp.h new file mode 100644 index 0000000000..7e05cac46c --- /dev/null +++ b/dll/win32/msctf/precomp.h @@ -0,0 +1,29 @@ + +#ifndef _MSCTF_PRECOMP_H +#define _MSCTF_PRECOMP_H + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <olectl.h> +#include <msctf.h> +#include <shlwapi.h> + +#include <wine/list.h> +#include <wine/unicode.h> +#include <wine/debug.h> + +#include "msctf_internal.h" + +#endif /* !_MSCTF_PRECOMP_H */ diff --git a/dll/win32/msctf/range.c b/dll/win32/msctf/range.c index e5a7fca2ee..dca8983efd 100644 --- a/dll/win32/msctf/range.c +++ b/dll/win32/msctf/range.c @@ -18,8 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagRange { ITfRange ITfRange_iface; /* const ITfRangeACPVtb *RangeACPVtbl; */ diff --git a/dll/win32/msctf/threadmgr.c b/dll/win32/msctf/threadmgr.c index 5dd77baaa5..8ca12ac078 100644 --- a/dll/win32/msctf/threadmgr.c +++ b/dll/win32/msctf/threadmgr.c @@ -18,8 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "olectl.h" + +#include "wine/unicode.h" + +#include "msctf.h" #include "msctf_internal.h" +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + typedef struct tagPreservedKey { struct list entry; diff --git a/dll/win32/msctf/version.rc b/dll/win32/msctf/version.rc index 956051f74a..56a0143734 100644 --- a/dll/win32/msctf/version.rc +++ b/dll/win32/msctf/version.rc @@ -25,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,3319 #define WINE_PRODUCTVERSION_STR "5.1.2600.3319" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 23caf121d5..1b709e7ab7 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -106,7 +106,7 @@ reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to WineStaging-2.9 +reactos/dll/win32/msctf # Synced to WineStaging-3.3 reactos/dll/win32/msftedit # Synced to WineStaging-2.9 reactos/dll/win32/msg711.acm # Synced to WineStaging-2.9 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-2.9

7 years

01/01: [MSCMS] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8123ffac58d68ee3b5e67… commit 8123ffac58d68ee3b5e67f32c054808da9519c6f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:27:29 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:27:29 2018 +0100 [MSCMS] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mscms/handle.c | 18 +++++++++--------- dll/win32/mscms/icc.c | 18 +++++++++--------- dll/win32/mscms/mscms_main.c | 22 +++++++++++----------- dll/win32/mscms/profile.c | 34 ++++++++++++++++------------------ dll/win32/mscms/stub.c | 18 ++++++++---------- dll/win32/mscms/transform.c | 22 ++++++++++------------ media/doc/README.WINE | 2 +- 7 files changed, 64 insertions(+), 70 deletions(-) diff --git a/dll/win32/mscms/handle.c b/dll/win32/mscms/handle.c index abef97313e..10334c65b2 100644 --- a/dll/win32/mscms/handle.c +++ b/dll/win32/mscms/handle.c @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/debug.h> +#include "config.h" +#include "wine/debug.h" -//#include <stdarg.h> +#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "icm.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "icm.h" -//#include "mscms_priv.h" +#include "mscms_priv.h" #ifdef HAVE_LCMS2 diff --git a/dll/win32/mscms/icc.c b/dll/win32/mscms/icc.c index 09c9411089..8cd99c5bca 100644 --- a/dll/win32/mscms/icc.c +++ b/dll/win32/mscms/icc.c @@ -18,18 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#include "config.h" -//#include <stdarg.h> +#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winternl.h" -//#include "icm.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/winternl.h" +#include "icm.h" -//#include "mscms_priv.h" +#include "mscms_priv.h" #ifdef HAVE_LCMS2 diff --git a/dll/win32/mscms/mscms_main.c b/dll/win32/mscms/mscms_main.c index 3cffd7ad05..40808c5706 100644 --- a/dll/win32/mscms/mscms_main.c +++ b/dll/win32/mscms/mscms_main.c @@ -18,21 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#include "config.h" -//#include "wine/port.h" -#include <wine/debug.h> -#include <wine/library.h> +#include "wine/port.h" +#include "wine/debug.h" +#include "wine/library.h" -//#include <stdarg.h> +#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "icm.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "icm.h" -//#include "mscms_priv.h" +#include "mscms_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(mscms); diff --git a/dll/win32/mscms/profile.c b/dll/win32/mscms/profile.c index eba642d789..f0c40877a1 100644 --- a/dll/win32/mscms/profile.c +++ b/dll/win32/mscms/profile.c @@ -18,24 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" -#include <wingdi.h> -#include <winuser.h> -#include <winreg.h> -//#include "shlwapi.h" -#include <icm.h> - -//#include "mscms_priv.h" +#include "config.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "shlwapi.h" +#include "icm.h" + +#include "mscms_priv.h" static void basename( LPCWSTR path, LPWSTR name ) { diff --git a/dll/win32/mscms/stub.c b/dll/win32/mscms/stub.c index 8eb539ed0a..4cd6863f21 100644 --- a/dll/win32/mscms/stub.c +++ b/dll/win32/mscms/stub.c @@ -18,18 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS +#include "config.h" +#include "wine/debug.h" -#include <config.h> -#include <wine/debug.h> +#include <stdarg.h> -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include <wingdi.h> -#include <winuser.h> -#include <icm.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "icm.h" #include "mscms_priv.h" diff --git a/dll/win32/mscms/transform.c b/dll/win32/mscms/transform.c index 0339d7d211..cada3329ac 100644 --- a/dll/win32/mscms/transform.c +++ b/dll/win32/mscms/transform.c @@ -18,21 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS +#include "config.h" +#include "wine/debug.h" -#include <config.h> -#include <wine/debug.h> +#include <stdarg.h> -//#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "icm.h" -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <wingdi.h> -#include <winuser.h> -#include <icm.h> - -//#include "mscms_priv.h" +#include "mscms_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(mscms); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 462bd154d6..23caf121d5 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -104,7 +104,7 @@ reactos/dll/win32/msacm32 # Synced to WineStaging-3.3 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 -reactos/dll/win32/mscms # Synced to WineStaging-2.9 +reactos/dll/win32/mscms # Synced to WineStaging-3.3 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-2.9 reactos/dll/win32/msftedit # Synced to WineStaging-2.9

7 years

01/01: [MSCAT32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6244404e01f628a54d768… commit 6244404e01f628a54d768488e2ba1d4e4e0b80be Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:26:27 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:26:27 2018 +0100 [MSCAT32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mscat32/main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/mscat32/main.c b/dll/win32/mscat32/main.c index 1e93d3b8dd..d2b9d8bd67 100644 --- a/dll/win32/mscat32/main.c +++ b/dll/win32/mscat32/main.c @@ -17,14 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <config.h> +#include "config.h" #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mscat); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c69306ac2c..462bd154d6 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -103,7 +103,7 @@ reactos/dll/win32/mprapi # Synced to WineStaging-3.3 reactos/dll/win32/msacm32 # Synced to WineStaging-3.3 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 -reactos/dll/win32/mscat32 # Synced to WineStaging-2.9 +reactos/dll/win32/mscat32 # Synced to WineStaging-3.3 reactos/dll/win32/mscms # Synced to WineStaging-2.9 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-2.9

7 years

01/01: [MSADP32.ACM] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99cd8173f2469e27a1c5e… commit 99cd8173f2469e27a1c5e5354e90f5ae82f49f12 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:25:31 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:25:31 2018 +0100 [MSADP32.ACM] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msadp32.acm/msadp32.c | 24 +++++++++++------------- media/doc/README.WINE | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dll/win32/msadp32.acm/msadp32.c b/dll/win32/msadp32.acm/msadp32.c index 33707ab19a..24e0c6a72b 100644 --- a/dll/win32/msadp32.acm/msadp32.c +++ b/dll/win32/msadp32.acm/msadp32.c @@ -19,21 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <assert.h> #include <stdarg.h> -//#include <string.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 <wine/debug.h> +#include <string.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 "wine/debug.h" /* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 83e1f4cd6c..c69306ac2c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -102,7 +102,7 @@ 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-3.3 reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-3.3 reactos/dll/win32/mscat32 # Synced to WineStaging-2.9 reactos/dll/win32/mscms # Synced to WineStaging-2.9 reactos/dll/win32/mscoree # Synced to Wine-1.5.4

7 years

01/01: [MSACM32.DRV] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a51fd57df1b13cf85434f… commit a51fd57df1b13cf85434fab4490c9a69889aa13b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:24:36 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:24:36 2018 +0100 [MSACM32.DRV] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msacm32.drv/wavemap.c | 22 ++++++++++------------ media/doc/README.WINE | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dll/win32/msacm32.drv/wavemap.c b/dll/win32/msacm32.drv/wavemap.c index bf9e37cac0..4c8cb6c257 100644 --- a/dll/win32/msacm32.drv/wavemap.c +++ b/dll/win32/msacm32.drv/wavemap.c @@ -28,19 +28,17 @@ * those should be taken care of... */ -#define WIN32_NO_STATUS - #include <stdarg.h> -//#include <string.h> -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -#include <winuser.h> -#include <mmddk.h> -#include <mmreg.h> -#include <msacm.h> -#include <wine/unicode.h> -#include <wine/debug.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "mmddk.h" +#include "mmreg.h" +#include "msacm.h" +#include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wavemap); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 92d7b248dc..83e1f4cd6c 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -101,7 +101,7 @@ 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-3.3 -reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9 +reactos/dll/win32/msacm32.drv # Synced to WineStaging-3.3 reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mscat32 # Synced to WineStaging-2.9 reactos/dll/win32/mscms # Synced to WineStaging-2.9

7 years

01/01: [MSACM32_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f302bfa196de8a5610dc6… commit f302bfa196de8a5610dc6ff3ee3289329cffd119 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:23:28 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:23:28 2018 +0100 [MSACM32_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/msacm32/msacm.c | 71 ++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/modules/rostests/winetests/msacm32/msacm.c b/modules/rostests/winetests/msacm32/msacm.c index a484896cce..ce1837c0a8 100644 --- a/modules/rostests/winetests/msacm32/msacm.c +++ b/modules/rostests/winetests/msacm32/msacm.c @@ -1276,6 +1276,76 @@ static void test_acmFormatChoose(void) HeapFree(GetProcessHeap(), 0, pwfx); } +static void test_mp3(void) +{ + MPEGLAYER3WAVEFORMAT src; + WAVEFORMATEX dst; + HACMSTREAM has; + DWORD output; + MMRESULT mr; + + src.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + src.wfx.nSamplesPerSec = 11025; + src.wfx.wBitsPerSample = 0; + src.wfx.nChannels = 1; + src.wfx.nBlockAlign = 576; + src.wfx.nAvgBytesPerSec = 2000; + + src.wID = MPEGLAYER3_ID_MPEG; + src.fdwFlags = 0; + src.nBlockSize = 576; + src.nFramesPerBlock = 1; + src.nCodecDelay = 0; + + dst.cbSize = 0; + dst.wFormatTag = WAVE_FORMAT_PCM; + dst.nSamplesPerSec = 11025; + dst.wBitsPerSample = 16; + dst.nChannels = 1; + dst.nBlockAlign = dst.wBitsPerSample * dst.nChannels / 8; + dst.nAvgBytesPerSec = dst.nSamplesPerSec * dst.nBlockAlign; + + src.wfx.cbSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + src.wID = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == ACMERR_NOTPOSSIBLE, "expected error ACMERR_NOTPOSSIBLE, got 0x%x\n", mr); + if (mr == MMSYSERR_NOERROR) acmStreamClose(has, 0); + + src.wID = MPEGLAYER3_ID_MPEG; + src.nBlockSize = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + + src.nBlockSize = 576; + src.wfx.nAvgBytesPerSec = 0; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + /* causes a division by zero exception */ + if (0) acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + + src.wfx.nAvgBytesPerSec = 2000; + + mr = acmStreamOpen(&has, NULL, (WAVEFORMATEX*)&src, &dst, NULL, 0, 0, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + mr = acmStreamSize(has, 4000, &output, ACM_STREAMSIZEF_SOURCE); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); + mr = acmStreamClose(has, 0); + ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr); +} + static struct { struct @@ -1446,6 +1516,7 @@ START_TEST(msacm) test_acmFormatSuggest(); test_acmFormatTagDetails(); test_acmFormatChoose(); + test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd();

7 years

01/01: [MSACM32] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=168ccfac22fd3a101d6b7… commit 168ccfac22fd3a101d6b7bcf8007ec4c78f8f1b2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 18 12:20:12 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 18 12:20:37 2018 +0100 [MSACM32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/msacm32/CMakeLists.txt | 4 ++-- dll/win32/msacm32/driver.c | 19 +++++++++++++++++++ dll/win32/msacm32/filter.c | 14 ++++++++++++++ dll/win32/msacm32/format.c | 16 ++++++++++++++++ dll/win32/msacm32/internal.c | 17 ++++++++++++++++- dll/win32/msacm32/msacm.rc | 7 +++---- dll/win32/msacm32/msacm32_main.c | 12 ++++++++++++ dll/win32/msacm32/pcmconverter.c | 21 ++++++++++++++++++++- dll/win32/msacm32/precomp.h | 17 +++++++++++++++++ dll/win32/msacm32/stream.c | 13 +++++++++++++ dll/win32/msacm32/wineacm.h | 16 +++------------- media/doc/README.WINE | 2 +- 12 files changed, 136 insertions(+), 22 deletions(-) diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt index 9be89256cc..88a5830b0b 100644 --- a/dll/win32/msacm32/CMakeLists.txt +++ b/dll/win32/msacm32/CMakeLists.txt @@ -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) diff --git a/dll/win32/msacm32/driver.c b/dll/win32/msacm32/driver.c index 778a5983f6..e0c5fdd90e 100644 --- a/dll/win32/msacm32/driver.c +++ b/dll/win32/msacm32/driver.c @@ -21,7 +21,26 @@ * 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.@) diff --git a/dll/win32/msacm32/filter.c b/dll/win32/msacm32/filter.c index 4f21bc8374..53db82777d 100644 --- a/dll/win32/msacm32/filter.c +++ b/dll/win32/msacm32/filter.c @@ -20,7 +20,21 @@ * 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.@) diff --git a/dll/win32/msacm32/format.c b/dll/win32/msacm32/format.c index 9535f20332..b3d2900393 100644 --- a/dll/win32/msacm32/format.c +++ b/dll/win32/msacm32/format.c @@ -19,8 +19,24 @@ * 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 diff --git a/dll/win32/msacm32/internal.c b/dll/win32/msacm32/internal.c index 6550f4c270..7bafcaad5e 100644 --- a/dll/win32/msacm32/internal.c +++ b/dll/win32/msacm32/internal.c @@ -21,9 +21,24 @@ * 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); /**********************************************************************/ diff --git a/dll/win32/msacm32/msacm.rc b/dll/win32/msacm32/msacm.rc index f26f474cb9..f72be33cac 100644 --- a/dll/win32/msacm32/msacm.rc +++ b/dll/win32/msacm32/msacm.rc @@ -15,12 +15,11 @@ * * 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> diff --git a/dll/win32/msacm32/msacm32_main.c b/dll/win32/msacm32/msacm32_main.c index ae362f25cc..efe58af309 100644 --- a/dll/win32/msacm32/msacm32_main.c +++ b/dll/win32/msacm32/msacm32_main.c @@ -21,8 +21,20 @@ * 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; diff --git a/dll/win32/msacm32/pcmconverter.c b/dll/win32/msacm32/pcmconverter.c index 61a1b354ec..d52662ac76 100644 --- a/dll/win32/msacm32/pcmconverter.c +++ b/dll/win32/msacm32/pcmconverter.c @@ -26,9 +26,28 @@ * 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 index 0000000000..dae503337b --- /dev/null +++ b/dll/win32/msacm32/precomp.h @@ -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 */ diff --git a/dll/win32/msacm32/stream.c b/dll/win32/msacm32/stream.c index a938d80371..e06503abfe 100644 --- a/dll/win32/msacm32/stream.c +++ b/dll/win32/msacm32/stream.c @@ -28,8 +28,21 @@ * + 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); diff --git a/dll/win32/msacm32/wineacm.h b/dll/win32/msacm32/wineacm.h index 11dea6e05b..37d639d215 100644 --- a/dll/win32/msacm32/wineacm.h +++ b/dll/win32/msacm32/wineacm.h @@ -20,21 +20,11 @@ #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 */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 442dd6dd8f..92d7b248dc 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -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

7 years

← Newer
1
...
24
25
26
27
28
29
30
...
44
Older →

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 March 2018