Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c982d0105311c3cb2473… commit 9c982d0105311c3cb24733bded8649b809a519c5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:23:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:23:10 2018 +0100 [MMDEVAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mmdevapi/CMakeLists.txt | 4 ++-- dll/win32/mmdevapi/audiovolume.c | 22 ++++++++++++++++++++++ dll/win32/mmdevapi/devenum.c | 32 +++++++++++++++++++++++++------- dll/win32/mmdevapi/main.c | 29 ++++++++++++++++++++++++++++- dll/win32/mmdevapi/mmdevapi.h | 33 ++++----------------------------- dll/win32/mmdevapi/precomp.h | 31 +++++++++++++++++++++++++++++++ media/doc/README.WINE | 2 +- 7 files changed, 113 insertions(+), 40 deletions(-) diff --git a/dll/win32/mmdevapi/CMakeLists.txt b/dll/win32/mmdevapi/CMakeLists.txt index 8d9b5fbc80..5d4245ca09 100644 --- a/dll/win32/mmdevapi/CMakeLists.txt +++ b/dll/win32/mmdevapi/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND SOURCE audiovolume.c devenum.c main.c - mmdevapi.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c) add_library(mmdevapi SHARED @@ -22,6 +22,6 @@ add_library(mmdevapi SHARED set_module_type(mmdevapi win32dll) target_link_libraries(mmdevapi uuid wine) add_importlibs(mmdevapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_pch(mmdevapi mmdevapi.h SOURCE) +add_pch(mmdevapi precomp.h SOURCE) add_dependencies(mmdevapi dxsdk) add_cd_file(TARGET mmdevapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mmdevapi/audiovolume.c b/dll/win32/mmdevapi/audiovolume.c index 22613fe33e..76f9f4ec1e 100644 --- a/dll/win32/mmdevapi/audiovolume.c +++ b/dll/win32/mmdevapi/audiovolume.c @@ -16,8 +16,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "ole2.h" +#include "mmdeviceapi.h" +#include "mmsystem.h" +#include "dsound.h" +#include "audioclient.h" +#include "endpointvolume.h" +#include "audiopolicy.h" + #include "mmdevapi.h" +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; diff --git a/dll/win32/mmdevapi/devenum.c b/dll/win32/mmdevapi/devenum.c index 3cfe661c0f..b189e8e060 100644 --- a/dll/win32/mmdevapi/devenum.c +++ b/dll/win32/mmdevapi/devenum.c @@ -16,15 +16,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "mmdevapi.h" +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" + +#include "initguid.h" +#include "ole2.h" +#include "mmdeviceapi.h" +#include "dshow.h" +#include "dsound.h" +#include "audioclient.h" +#include "endpointvolume.h" +#include "audiopolicy.h" -#include <wine/list.h> +#include "mmdevapi.h" +#include "devpkey.h" -#include <oleauto.h> -#include <initguid.h> -#define _WINDOWS_H -#include <dshow.h> -#include <devpkey.h> +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); static const WCHAR software_mmdevapi[] = { 'S','o','f','t','w','a','r','e','\\', diff --git a/dll/win32/mmdevapi/main.c b/dll/win32/mmdevapi/main.c index db5a1168e1..2b0a6f946b 100644 --- a/dll/win32/mmdevapi/main.c +++ b/dll/win32/mmdevapi/main.c @@ -17,9 +17,36 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "wine/library.h" + +#include "ole2.h" +#include "olectl.h" +#include "rpcproxy.h" +#include "propsys.h" +#include "propkeydef.h" +#include "mmdeviceapi.h" +#include "mmsystem.h" +#include "dsound.h" +#include "audioclient.h" +#include "endpointvolume.h" +#include "audiopolicy.h" +#include "devpkey.h" +#include "winreg.h" + #include "mmdevapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); static HINSTANCE instance; diff --git a/dll/win32/mmdevapi/mmdevapi.h b/dll/win32/mmdevapi/mmdevapi.h index 4358901d13..ecf44c6e9f 100644 --- a/dll/win32/mmdevapi/mmdevapi.h +++ b/dll/win32/mmdevapi/mmdevapi.h @@ -16,34 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _MMDEVAPI_H_ -#define _MMDEVAPI_H_ +#pragma once -#include <wine/config.h> -#include <wine/port.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winreg.h> -#include <objbase.h> -#include <audiopolicy.h> -#include <endpointvolume.h> -#include <mmdeviceapi.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; @@ -102,5 +79,3 @@ extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; - -#endif /* _MMDEVAPI_H_ */ diff --git a/dll/win32/mmdevapi/precomp.h b/dll/win32/mmdevapi/precomp.h new file mode 100644 index 0000000000..9d554feba0 --- /dev/null +++ b/dll/win32/mmdevapi/precomp.h @@ -0,0 +1,31 @@ + +#ifndef _MMDEVAPI_PRECOMP_H_ +#define _MMDEVAPI_PRECOMP_H_ + +#include <wine/config.h> +#include <wine/port.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <objbase.h> +#include <audiopolicy.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "mmdevapi.h" + +#endif /* !_MMDEVAPI_PRECOMP_H_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3a0bdb184f..869affc759 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -97,7 +97,7 @@ reactos/dll/win32/mciseq # Synced to WineStaging-3.3 reactos/dll/win32/mciwave # Synced to WineStaging-3.3 reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 reactos/dll/win32/mlang # Synced to WineStaging-3.3 -reactos/dll/win32/mmdevapi # Synced to Wine-3.0 +reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3 reactos/dll/win32/mpr # Synced to Wine-3.0 reactos/dll/win32/mprapi # Synced to WineStaging-2.9 reactos/dll/win32/msacm32 # Synced to WineStaging-2.16

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c523eef19d9565c9eee2… commit 2c523eef19d9565c9eee245c3ee3b72c55a8d8ef Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:22:13 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:22:13 2018 +0100 [MLANG] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mlang/mlang.c | 33 +++++++++++++++------------------ media/doc/README.WINE | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dll/win32/mlang/mlang.c b/dll/win32/mlang/mlang.c index 9554c4de33..bada104a36 100644 --- a/dll/win32/mlang/mlang.c +++ b/dll/win32/mlang/mlang.c @@ -21,33 +21,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> +#include "config.h" #include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <ole2.h> -//#include "objbase.h" -#include <rpcproxy.h> -#include <mlang.h> -#include <mimeole.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ole2.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "mlang.h" +#include "mimeole.h" -#include <wine/list.h> -#include <wine/unicode.h> -#include <wine/debug.h> +#include "wine/unicode.h" +#include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mlang); -//#include "initguid.h" +#include "initguid.h" static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f62668d904..3a0bdb184f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -96,7 +96,7 @@ reactos/dll/win32/mciqtz32 # Synced to WineStaging-3.3 reactos/dll/win32/mciseq # Synced to WineStaging-3.3 reactos/dll/win32/mciwave # Synced to WineStaging-3.3 reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 -reactos/dll/win32/mlang # Synced to Wine-3.0 +reactos/dll/win32/mlang # Synced to WineStaging-3.3 reactos/dll/win32/mmdevapi # Synced to Wine-3.0 reactos/dll/win32/mpr # Synced to Wine-3.0 reactos/dll/win32/mprapi # Synced to WineStaging-2.9

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03435e171d374e1ab3c79… commit 03435e171d374e1ab3c79ed80433c4fb0c0c7e90 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:21:24 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:21:24 2018 +0100 [MGMTAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mgmtapi/mgmtapi.c | 7 +++---- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dll/win32/mgmtapi/mgmtapi.c b/dll/win32/mgmtapi/mgmtapi.c index d735e07a62..06c540a527 100644 --- a/dll/win32/mgmtapi/mgmtapi.c +++ b/dll/win32/mgmtapi/mgmtapi.c @@ -17,10 +17,9 @@ */ #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(mgmtapi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d7a8b9e58f..f62668d904 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -95,7 +95,7 @@ reactos/dll/win32/mcicda # Synced to WineStaging-3.3 reactos/dll/win32/mciqtz32 # Synced to WineStaging-3.3 reactos/dll/win32/mciseq # Synced to WineStaging-3.3 reactos/dll/win32/mciwave # Synced to WineStaging-3.3 -reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9 +reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 reactos/dll/win32/mlang # Synced to Wine-3.0 reactos/dll/win32/mmdevapi # Synced to Wine-3.0 reactos/dll/win32/mpr # Synced to Wine-3.0

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=017f6919b946ab2f3b23d… commit 017f6919b946ab2f3b23d2fe58a0eaadbbcc549f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:20:37 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:20:37 2018 +0100 [MCIWAVE] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mciwave/mciwave.c | 20 +++++++++----------- media/doc/README.WINE | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dll/win32/mciwave/mciwave.c b/dll/win32/mciwave/mciwave.c index 74d33f402c..fd4d6f6728 100644 --- a/dll/win32/mciwave/mciwave.c +++ b/dll/win32/mciwave/mciwave.c @@ -21,20 +21,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <assert.h> #include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -#include <winuser.h> -#include <mmddk.h> -#include <wownt32.h> -#include <digitalv.h> -#include <wine/debug.h> -#include <wine/unicode.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "mmddk.h" +#include "wownt32.h" +#include "digitalv.h" +#include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciwave); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 51ee167568..d7a8b9e58f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -94,7 +94,7 @@ reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3 reactos/dll/win32/mcicda # Synced to WineStaging-3.3 reactos/dll/win32/mciqtz32 # Synced to WineStaging-3.3 reactos/dll/win32/mciseq # Synced to WineStaging-3.3 -reactos/dll/win32/mciwave # Synced to WineStaging-2.9 +reactos/dll/win32/mciwave # Synced to WineStaging-3.3 reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9 reactos/dll/win32/mlang # Synced to Wine-3.0 reactos/dll/win32/mmdevapi # Synced to Wine-3.0

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2d8742882787be47b68b… commit a2d8742882787be47b68ba65e813c62716164fb1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:19:53 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:19:53 2018 +0100 [MCISEQ] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mciseq/mcimidi.c | 26 ++++++++++++-------------- media/doc/README.WINE | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dll/win32/mciseq/mcimidi.c b/dll/win32/mciseq/mcimidi.c index 4cd6f51006..864ab98067 100644 --- a/dll/win32/mciseq/mcimidi.c +++ b/dll/win32/mciseq/mcimidi.c @@ -25,21 +25,19 @@ * + better implement non waiting command (without the MCI_WAIT flag). */ -#define WIN32_NO_STATUS - -//#include <stdlib.h> +#include <stdlib.h> #include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -#include <winuser.h> -#include <wownt32.h> -#include <mmddk.h> -#include <wine/debug.h> -#include <wine/unicode.h> +#include <stdio.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wownt32.h" +#include "mmddk.h" +#include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mcimidi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index bc9f80f442..51ee167568 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -93,7 +93,7 @@ reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3 reactos/dll/win32/mcicda # Synced to WineStaging-3.3 reactos/dll/win32/mciqtz32 # Synced to WineStaging-3.3 -reactos/dll/win32/mciseq # Synced to WineStaging-2.9 +reactos/dll/win32/mciseq # Synced to WineStaging-3.3 reactos/dll/win32/mciwave # Synced to WineStaging-2.9 reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9 reactos/dll/win32/mlang # Synced to Wine-3.0

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b96cf0b1024b143df02c3… commit b96cf0b1024b143df02c3cf4f2a4525e79d5fd58 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:19:04 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:19:04 2018 +0100 [MCIQTZ32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mciqtz32/mciavi_res.rc | 8 ++++---- dll/win32/mciqtz32/mciqtz.c | 17 +++++++---------- dll/win32/mciqtz32/mciqtz_private.h | 2 +- dll/win32/mciqtz32/version.rc | 2 +- media/doc/README.WINE | 2 +- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dll/win32/mciqtz32/mciavi_res.rc b/dll/win32/mciqtz32/mciavi_res.rc index 8db52cf992..57436049ea 100644 --- a/dll/win32/mciqtz32/mciavi_res.rc +++ b/dll/win32/mciqtz32/mciavi_res.rc @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -#include <mmddk.h> -#include <digitalv.h> +#include "windef.h" +#include "winbase.h" +#include "mmddk.h" +#include "digitalv.h" #ifdef MCI_INTEGER64 #define MCI_DWORD_PTR MCI_INTEGER64 diff --git a/dll/win32/mciqtz32/mciqtz.c b/dll/win32/mciqtz32/mciqtz.c index 0e0aa6339e..1aec32635b 100644 --- a/dll/win32/mciqtz32/mciqtz.c +++ b/dll/win32/mciqtz32/mciqtz.c @@ -18,19 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN - #include <stdarg.h> #include <math.h> - -#include <windef.h> -#include <mmddk.h> -#include <wine/debug.h> - +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "mmddk.h" +#include "wine/debug.h" #include "mciqtz_private.h" -#include <digitalv.h> -#include <wownt32.h> +#include "digitalv.h" +#include "wownt32.h" WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); diff --git a/dll/win32/mciqtz32/mciqtz_private.h b/dll/win32/mciqtz32/mciqtz_private.h index fcdfdb8ca2..aa6fad9932 100644 --- a/dll/win32/mciqtz32/mciqtz_private.h +++ b/dll/win32/mciqtz32/mciqtz_private.h @@ -23,7 +23,7 @@ #define COBJMACROS -#include <dshow.h> +#include "dshow.h" typedef struct { MCIDEVICEID wDevID; diff --git a/dll/win32/mciqtz32/version.rc b/dll/win32/mciqtz32/version.rc index a0de28b0f6..b27e76bced 100644 --- a/dll/win32/mciqtz32/version.rc +++ b/dll/win32/mciqtz32/version.rc @@ -24,4 +24,4 @@ #define WINE_PRODUCTVERSION_STR "6.5" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#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 e2b6d60598..bc9f80f442 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -92,7 +92,7 @@ reactos/dll/win32/lz32 # Synced to WineStaging-3.3 reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3 reactos/dll/win32/mcicda # Synced to WineStaging-3.3 -reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-3.3 reactos/dll/win32/mciseq # Synced to WineStaging-2.9 reactos/dll/win32/mciwave # Synced to WineStaging-2.9 reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=122f1078cd28ec0c9a42e… commit 122f1078cd28ec0c9a42e84fa264931a5255606e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:18:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:18:10 2018 +0100 [MCICDA] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mcicda/mcicda.c | 32 +++++++++++++++----------------- media/doc/README.WINE | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dll/win32/mcicda/mcicda.c b/dll/win32/mcicda/mcicda.c index 1a1a52485b..ab4c1cd205 100644 --- a/dll/win32/mcicda/mcicda.c +++ b/dll/win32/mcicda/mcicda.c @@ -20,26 +20,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <config.h> +#include "config.h" #include <stdarg.h> -//#include <stdio.h> -//#include <string.h> +#include <stdio.h> +#include <string.h> #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -#include <winuser.h> -#include <wownt32.h> -#include <mmddk.h> -#include <winioctl.h> -#include <ntddcdrm.h> -//#include "winternl.h" -#include <wine/debug.h> -#include <wine/unicode.h> -#include <dsound.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wownt32.h" +#include "mmddk.h" +#include "winioctl.h" +#include "ntddcdrm.h" +#include "wine/winternl.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "dsound.h" WINE_DEFAULT_DEBUG_CHANNEL(mcicda); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index e7ce120e71..e2b6d60598 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -91,7 +91,7 @@ reactos/dll/win32/loadperf # Synced to WineStaging-3.3 reactos/dll/win32/lz32 # Synced to WineStaging-3.3 reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3 -reactos/dll/win32/mcicda # Synced to WineStaging-2.9 +reactos/dll/win32/mcicda # Synced to WineStaging-3.3 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9 reactos/dll/win32/mciseq # Synced to WineStaging-2.9 reactos/dll/win32/mciwave # Synced to WineStaging-2.9

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba65d708f669a5d3a9c92… commit ba65d708f669a5d3a9c929a23c25c308e3d4c7cb Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:17:07 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:17:07 2018 +0100 [MCIAVI32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mciavi32/CMakeLists.txt | 4 ++-- dll/win32/mciavi32/info.c | 5 +++++ dll/win32/mciavi32/mciavi.c | 6 ++++-- dll/win32/mciavi32/mciavi_res.rc | 8 ++++---- dll/win32/mciavi32/mmoutput.c | 3 +++ dll/win32/mciavi32/precomp.h | 13 +++++++++++++ dll/win32/mciavi32/private_mciavi.h | 23 +++++++++-------------- dll/win32/mciavi32/wnd.c | 4 ++++ media/doc/README.WINE | 2 +- 9 files changed, 45 insertions(+), 23 deletions(-) diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index 64b80faca6..bc6251076b 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND SOURCE mciavi.c mmoutput.c wnd.c - private_mciavi.h) + precomp.h) add_library(mciavi32 SHARED ${SOURCE} @@ -18,5 +18,5 @@ add_library(mciavi32 SHARED set_module_type(mciavi32 win32dll) target_link_libraries(mciavi32 wine) add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll) -add_pch(mciavi32 private_mciavi.h SOURCE) +add_pch(mciavi32 precomp.h SOURCE) add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mciavi32/info.c b/dll/win32/mciavi32/info.c index cc6abdcabb..3d138b1ddd 100644 --- a/dll/win32/mciavi32/info.c +++ b/dll/win32/mciavi32/info.c @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <string.h> #include "private_mciavi.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mciavi); /************************************************************************** * MCIAVI_ConvertFrameToTimeFormat [internal] diff --git a/dll/win32/mciavi32/mciavi.c b/dll/win32/mciavi32/mciavi.c index e083b4e4c0..b32accb645 100644 --- a/dll/win32/mciavi32/mciavi.c +++ b/dll/win32/mciavi32/mciavi.c @@ -37,10 +37,12 @@ * audio is played... still should be stopped ASAP */ +#include <string.h> #include "private_mciavi.h" +#include "wine/debug.h" +#include "wine/unicode.h" -#include <mciavi.h> -#include <wine/unicode.h> +WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); diff --git a/dll/win32/mciavi32/mciavi_res.rc b/dll/win32/mciavi32/mciavi_res.rc index 8290f14b58..e2e4caa805 100644 --- a/dll/win32/mciavi32/mciavi_res.rc +++ b/dll/win32/mciavi32/mciavi_res.rc @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -#include <mmddk.h> -#include <digitalv.h> +#include "windef.h" +#include "winbase.h" +#include "mmddk.h" +#include "digitalv.h" #ifdef MCI_INTEGER64 #define MCI_DWORD_PTR MCI_INTEGER64 diff --git a/dll/win32/mciavi32/mmoutput.c b/dll/win32/mciavi32/mmoutput.c index 65418002aa..ee0481c59c 100644 --- a/dll/win32/mciavi32/mmoutput.c +++ b/dll/win32/mciavi32/mmoutput.c @@ -20,6 +20,9 @@ */ #include "private_mciavi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream) { diff --git a/dll/win32/mciavi32/precomp.h b/dll/win32/mciavi32/precomp.h new file mode 100644 index 0000000000..a8204b4bff --- /dev/null +++ b/dll/win32/mciavi32/precomp.h @@ -0,0 +1,13 @@ + +#ifndef _MCIAVI_PRECOMP_H +#define _MCIAVI_PRECOMP_H + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include "private_mciavi.h" + +#include <wine/debug.h> + +#endif /* !_MCIAVI_PRECOMP_H */ diff --git a/dll/win32/mciavi32/private_mciavi.h b/dll/win32/mciavi32/private_mciavi.h index dbaf30f50d..1b53ab8d24 100644 --- a/dll/win32/mciavi32/private_mciavi.h +++ b/dll/win32/mciavi32/private_mciavi.h @@ -22,20 +22,15 @@ #define __WINE_PRIVATE_MCIAVI_H #include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <wingdi.h> -#include <mmddk.h> -#include <digitalv.h> -#include <vfw.h> -#include <wownt32.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(mciavi); +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "mmddk.h" +#include "digitalv.h" +#include "vfw.h" +#include "wownt32.h" +#include "mciavi.h" struct MMIOPos { DWORD dwOffset; diff --git a/dll/win32/mciavi32/wnd.c b/dll/win32/mciavi32/wnd.c index 94b9b6b9a8..c9da9ec5c4 100644 --- a/dll/win32/mciavi32/wnd.c +++ b/dll/win32/mciavi32/wnd.c @@ -19,7 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <string.h> #include "private_mciavi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0}; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a07c99f423..e7ce120e71 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -90,7 +90,7 @@ reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 reactos/dll/win32/loadperf # Synced to WineStaging-3.3 reactos/dll/win32/lz32 # Synced to WineStaging-3.3 reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 -reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 +reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3 reactos/dll/win32/mcicda # Synced to WineStaging-2.9 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9 reactos/dll/win32/mciseq # Synced to WineStaging-2.9

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4dd96d425c5158a3dc6b4… commit 4dd96d425c5158a3dc6b49d475e65db0d43b59bd Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:16:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:16:08 2018 +0100 [MAPI32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mapi32/imalloc.c | 18 +++++++++++++++++- dll/win32/mapi32/mapi32_main.c | 15 ++++++++++++++- dll/win32/mapi32/precomp.h | 5 ++--- dll/win32/mapi32/prop.c | 18 +++++++++++++++--- dll/win32/mapi32/res.h | 2 ++ dll/win32/mapi32/sendmail.c | 29 +++++++++++++++++++++++++---- dll/win32/mapi32/stubs.c | 2 ++ dll/win32/mapi32/util.c | 25 ++++++++++++++++++++----- dll/win32/mapi32/util.h | 6 +++++- media/doc/README.WINE | 2 +- 10 files changed, 103 insertions(+), 19 deletions(-) diff --git a/dll/win32/mapi32/imalloc.c b/dll/win32/mapi32/imalloc.c index 01cc61cf10..3e95a6c7cd 100644 --- a/dll/win32/mapi32/imalloc.c +++ b/dll/win32/mapi32/imalloc.c @@ -18,7 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "mapiutil.h" +#include "util.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); static const IMallocVtbl MAPI_IMalloc_vt; diff --git a/dll/win32/mapi32/mapi32_main.c b/dll/win32/mapi32/mapi32_main.c index 471010aaa6..0dcc811c24 100644 --- a/dll/win32/mapi32/mapi32_main.c +++ b/dll/win32/mapi32/mapi32_main.c @@ -18,7 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "objbase.h" +#include "initguid.h" +#include "mapix.h" +#include "mapiform.h" +#include "mapi.h" +#include "wine/debug.h" +#include "util.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; diff --git a/dll/win32/mapi32/precomp.h b/dll/win32/mapi32/precomp.h index c22246fedf..36a4771cbb 100644 --- a/dll/win32/mapi32/precomp.h +++ b/dll/win32/mapi32/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MAPI32_PCH_ #define _MAPI32_PCH_ @@ -25,6 +26,4 @@ #include "util.h" -WINE_DEFAULT_DEBUG_CHANNEL(mapi); - -#endif /* _MAPI32_PCH_ */ +#endif /* !_MAPI32_PCH_ */ diff --git a/dll/win32/mapi32/prop.c b/dll/win32/mapi32/prop.c index 1e323b1f15..03df644f21 100644 --- a/dll/win32/mapi32/prop.c +++ b/dll/win32/mapi32/prop.c @@ -18,9 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - -#include <wine/list.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "wine/list.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "mapival.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); BOOL WINAPI FBadRglpszA(LPSTR*,ULONG); diff --git a/dll/win32/mapi32/res.h b/dll/win32/mapi32/res.h index 28b33d44c3..4952a2dd20 100644 --- a/dll/win32/mapi32/res.h +++ b/dll/win32/mapi32/res.h @@ -21,6 +21,8 @@ #pragma once +#include <windef.h> + /* Strings */ #define IDS_NO_MAPI_CLIENT 1 #define IDS_SEND_MAIL 2 diff --git a/dll/win32/mapi32/sendmail.c b/dll/win32/mapi32/sendmail.c index 26883b0e53..9ebb220c03 100644 --- a/dll/win32/mapi32/sendmail.c +++ b/dll/win32/mapi32/sendmail.c @@ -19,12 +19,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - -#include <winuser.h> - +#include "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "objbase.h" +#include "objidl.h" +#include "mapi.h" +#include "mapix.h" +#include "mapiutil.h" +#include "mapidefs.h" +#include "winreg.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "wine/debug.h" +#include "util.h" #include "res.h" +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + #define READ_BUF_SIZE 4096 #define STORE_UNICODE_OK 0x00040000 diff --git a/dll/win32/mapi32/stubs.c b/dll/win32/mapi32/stubs.c index 65da2d5db4..87e4f2ffb3 100644 --- a/dll/win32/mapi32/stubs.c +++ b/dll/win32/mapi32/stubs.c @@ -1,5 +1,7 @@ #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK; HRESULT diff --git a/dll/win32/mapi32/util.c b/dll/win32/mapi32/util.c index 913497fa5e..13e4affc39 100644 --- a/dll/win32/mapi32/util.c +++ b/dll/win32/mapi32/util.c @@ -19,12 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - +#include <stdarg.h> #include <stdio.h> -#include <winternl.h> -#include <xcmc.h> -#include <msi.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "mapival.h" +#include "xcmc.h" +#include "msi.h" +#include "util.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); static const BYTE digitsToHex[] = { 0,1,2,3,4,5,6,7,8,9,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13,14,15, diff --git a/dll/win32/mapi32/util.h b/dll/win32/mapi32/util.h index 20db3d51ce..e8a524173f 100644 --- a/dll/win32/mapi32/util.h +++ b/dll/win32/mapi32/util.h @@ -19,8 +19,12 @@ */ #ifndef _MAPI_UTIL_H + #define _MAPI_UTIL_H +#include <mapi.h> +#include <mapix.h> + extern void load_mapi_providers(void) DECLSPEC_HIDDEN; extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; @@ -61,4 +65,4 @@ typedef struct MAPI_FUNCTIONS { extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; -#endif /* _MAPI_UTIL_H */ +#endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5e7bf6d162..a07c99f423 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -89,7 +89,7 @@ reactos/dll/win32/jscript # Synced to WineStaging-3.3 reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 reactos/dll/win32/loadperf # Synced to WineStaging-3.3 reactos/dll/win32/lz32 # Synced to WineStaging-3.3 -reactos/dll/win32/mapi32 # Synced to WineStaging-2.16 +reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-2.9 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9

6 years, 9 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be44829fa2b2a6e671f5f… commit be44829fa2b2a6e671f5fbdf2843973ad9031e48 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:14:57 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:14:57 2018 +0100 [LZ32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/lz32/version.rc | 2 +- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/lz32/version.rc b/dll/win32/lz32/version.rc index 6504322ccc..5f35c4f8e3 100644 --- a/dll/win32/lz32/version.rc +++ b/dll/win32/lz32/version.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,2180 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" -#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 54d25488e8..5e7bf6d162 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -88,7 +88,7 @@ reactos/dll/win32/itss # Synced to WineStaging-3.3 reactos/dll/win32/jscript # Synced to WineStaging-3.3 reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 reactos/dll/win32/loadperf # Synced to WineStaging-3.3 -reactos/dll/win32/lz32 # Synced to WineStaging-2.9 +reactos/dll/win32/lz32 # Synced to WineStaging-3.3 reactos/dll/win32/mapi32 # Synced to WineStaging-2.16 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-2.9

6 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
44
Older →

Jump to page:

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