Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [DXSDK] Add a header guard to aviriff.h.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7446d8c8a2b990189746f… commit 7446d8c8a2b990189746f7b30d15895cf556214c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:44:37 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:44:37 2018 +0100 [DXSDK] Add a header guard to aviriff.h. --- sdk/include/dxsdk/aviriff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/dxsdk/aviriff.h b/sdk/include/dxsdk/aviriff.h index d2cfa41421..ac7b1105b5 100644 --- a/sdk/include/dxsdk/aviriff.h +++ b/sdk/include/dxsdk/aviriff.h @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + /* All definitions here are packed structures of on-disk formats */ #include <pshpack2.h>

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3e7f8dd2d12407ae4a94… commit d3e7f8dd2d12407ae4a94d53def6f25f238a4d9a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:43:36 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:43:36 2018 +0100 [QEDIT] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/qedit/CMakeLists.txt | 4 ++-- dll/directx/wine/qedit/main.c | 4 +++- dll/directx/wine/qedit/mediadet.c | 14 ++++++++++++-- dll/directx/wine/qedit/precomp.h | 13 +++++++++++++ dll/directx/wine/qedit/qedit_private.h | 21 +++++++-------------- dll/directx/wine/qedit/samplegrabber.c | 14 +++++++++++++- dll/directx/wine/qedit/timeline.c | 13 +++++++++++++ media/doc/README.WINE | 2 +- 8 files changed, 64 insertions(+), 21 deletions(-) diff --git a/dll/directx/wine/qedit/CMakeLists.txt b/dll/directx/wine/qedit/CMakeLists.txt index e1ec65794f..7ee22ff31b 100644 --- a/dll/directx/wine/qedit/CMakeLists.txt +++ b/dll/directx/wine/qedit/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND SOURCE mediadet.c samplegrabber.c timeline.c - qedit_private.h) + precomp.h) add_library(qedit SHARED ${SOURCE} @@ -18,5 +18,5 @@ add_library(qedit SHARED set_module_type(qedit win32dll) target_link_libraries(qedit strmbase strmiids uuid wine) add_importlibs(qedit ole32 oleaut32 msvcrt kernel32 ntdll) -add_pch(qedit qedit_private.h SOURCE) +add_pch(qedit precomp.h SOURCE) add_cd_file(TARGET qedit DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/qedit/main.c b/dll/directx/wine/qedit/main.c index 5455a3bc94..a012ff210c 100644 --- a/dll/directx/wine/qedit/main.c +++ b/dll/directx/wine/qedit/main.c @@ -18,8 +18,10 @@ */ #include "qedit_private.h" +#include "rpcproxy.h" +#include "wine/debug.h" -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(qedit); static HINSTANCE instance; diff --git a/dll/directx/wine/qedit/mediadet.c b/dll/directx/wine/qedit/mediadet.c index 912e752225..b7a5abb80c 100644 --- a/dll/directx/wine/qedit/mediadet.c +++ b/dll/directx/wine/qedit/mediadet.c @@ -17,10 +17,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + #include "qedit_private.h" +#include "wine/debug.h" -#include <assert.h> -#include <oleauto.h> +WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { IUnknown IUnknown_inner; diff --git a/dll/directx/wine/qedit/precomp.h b/dll/directx/wine/qedit/precomp.h new file mode 100644 index 0000000000..292ddb2479 --- /dev/null +++ b/dll/directx/wine/qedit/precomp.h @@ -0,0 +1,13 @@ + +#ifndef _QEDIT_PRECOMP_H_ +#define _QEDIT_PRECOMP_H_ + +#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include "qedit_private.h" + +#include <wine/debug.h> + +#endif /* !_QEDIT_PRECOMP_H_ */ diff --git a/dll/directx/wine/qedit/qedit_private.h b/dll/directx/wine/qedit/qedit_private.h index e107227daa..708c53d7de 100644 --- a/dll/directx/wine/qedit/qedit_private.h +++ b/dll/directx/wine/qedit/qedit_private.h @@ -22,22 +22,15 @@ #include <stdarg.h> -#define WIN32_LEAN_AND_MEAN -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <dshow.h> -#define __WINE_DDRAW_H /* ROS HACK */ -#include <qedit.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(qedit); +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "wingdi.h" +#include "winuser.h" +#include "dshow.h" +#include "qedit.h" HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/qedit/samplegrabber.c b/dll/directx/wine/qedit/samplegrabber.c index 3f4cd133ec..cd35740595 100644 --- a/dll/directx/wine/qedit/samplegrabber.c +++ b/dll/directx/wine/qedit/samplegrabber.c @@ -17,9 +17,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + #include "qedit_private.h" +#include "wine/debug.h" +#include "wine/strmbase.h" -#include <wine/strmbase.h> +WINE_DEFAULT_DEBUG_CHANNEL(qedit); static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; diff --git a/dll/directx/wine/qedit/timeline.c b/dll/directx/wine/qedit/timeline.c index 52ef234f41..5d3fb461ff 100644 --- a/dll/directx/wine/qedit/timeline.c +++ b/dll/directx/wine/qedit/timeline.c @@ -17,7 +17,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + #include "qedit_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct { IUnknown IUnknown_inner; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 44c167c454..f702a41581 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -38,7 +38,7 @@ reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.3 -reactos/dll/directx/wine/qedit # Synced to Wine-3.0 +reactos/dll/directx/wine/qedit # Synced to WineStaging-3.3 reactos/dll/directx/wine/quartz # Synced to Wine-3.0 reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.3

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fdc68215576aae789ff6… commit 7fdc68215576aae789ff655742bdc536cde9a02b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:42:29 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:42:29 2018 +0100 [MSDMO] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/msdmo/dmoreg.c | 22 ++++++++++++++++------ dll/directx/wine/msdmo/dmort.c | 15 ++++++++++++--- dll/directx/wine/msdmo/precomp.h | 2 +- dll/directx/wine/msdmo/rsrc.rc | 2 +- media/doc/README.WINE | 2 +- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dll/directx/wine/msdmo/dmoreg.c b/dll/directx/wine/msdmo/dmoreg.c index 556391d137..67ba498bc4 100644 --- a/dll/directx/wine/msdmo/dmoreg.c +++ b/dll/directx/wine/msdmo/dmoreg.c @@ -17,12 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - -#include <winuser.h> -#include <winreg.h> -#include <wine/unicode.h> -#include <dmo.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/unicode.h" +#include "wine/debug.h" +#include "initguid.h" +#include "dmo.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdmo); #define MSDMO_MAJOR_VERSION 6 diff --git a/dll/directx/wine/msdmo/dmort.c b/dll/directx/wine/msdmo/dmort.c index de77f70f50..b586cac611 100644 --- a/dll/directx/wine/msdmo/dmort.c +++ b/dll/directx/wine/msdmo/dmort.c @@ -16,10 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> -#include <mediaobj.h> -#include <dmort.h> +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "mediaobj.h" +#include "dmort.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdmo); /*********************************************************************** * MoCreateMediaType (MSDMO.@) diff --git a/dll/directx/wine/msdmo/precomp.h b/dll/directx/wine/msdmo/precomp.h index ceb8d707d8..a13e185f6f 100644 --- a/dll/directx/wine/msdmo/precomp.h +++ b/dll/directx/wine/msdmo/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MSDMO_PCH_ #define _MSDMO_PCH_ @@ -15,6 +16,5 @@ #include <objbase.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msdmo); #endif /* _MSDMO_PCH_ */ diff --git a/dll/directx/wine/msdmo/rsrc.rc b/dll/directx/wine/msdmo/rsrc.rc index 2c24781dc4..a313b9791f 100644 --- a/dll/directx/wine/msdmo/rsrc.rc +++ b/dll/directx/wine/msdmo/rsrc.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 6,5,1,900 #define WINE_PRODUCTVERSION_STR "6.5" -#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 111a877b04..44c167c454 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -37,7 +37,7 @@ reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.3 reactos/dll/directx/wine/qedit # Synced to Wine-3.0 reactos/dll/directx/wine/quartz # Synced to Wine-3.0 reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.3

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4203ed112ef687cc179ff… commit 4203ed112ef687cc179ff2ef8a5b4083edc34917 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:41:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:41:10 2018 +0100 [DXDIAGN_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/dxdiagn/container.c | 172 ++++++++++++++++++++++++- modules/rostests/winetests/dxdiagn/provider.c | 6 +- 2 files changed, 171 insertions(+), 7 deletions(-) diff --git a/modules/rostests/winetests/dxdiagn/container.c b/modules/rostests/winetests/dxdiagn/container.c index 3da9985b8d..2e58493a8f 100644 --- a/modules/rostests/winetests/dxdiagn/container.c +++ b/modules/rostests/winetests/dxdiagn/container.c @@ -21,9 +21,9 @@ #define COBJMACROS #include <stdio.h> -#include <wine/dxdiag.h> -#include <oleauto.h> -#include <wine/test.h> +#include "wine/dxdiag.h" +#include "oleauto.h" +#include "wine/test.h" struct property_test { @@ -36,6 +36,11 @@ static IDxDiagContainer *pddc; static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; +static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d','.', + 'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; +static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d','.', + 'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e', + 'D','e','v','i','c','e','s',0}; /* Based on debugstr_variant in dlls/jscript/jsutils.c. */ static const char *debugstr_variant(const VARIANT *var) @@ -896,7 +901,8 @@ static void test_DxDiag_SystemInfo(void) {szProcessorEnglish, VT_BSTR}, }; - IDxDiagContainer *container; + IDxDiagContainer *container, *container2; + static const WCHAR empty[] = {0}; HRESULT hr; if (!create_root_IDxDiagContainer()) @@ -905,6 +911,9 @@ static void test_DxDiag_SystemInfo(void) return; } + hr = IDxDiagContainer_GetChildContainer(pddc, empty, &container2); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SystemInfo, &container); ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); @@ -912,6 +921,14 @@ static void test_DxDiag_SystemInfo(void) { trace("Testing container DxDiag_SystemInfo\n"); test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + + container2 = NULL; + hr = IDxDiagContainer_GetChildContainer(container, empty, &container2); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(container2 != NULL, "Expected container2 != NULL\n"); + ok(container2 != container, "Expected container != container2\n"); + if (hr == S_OK) IDxDiagContainer_Release(container2); + IDxDiagContainer_Release(container); } @@ -942,6 +959,7 @@ static void test_DxDiag_DisplayDevices(void) static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; static const struct property_test property_tests[] = { @@ -966,6 +984,7 @@ static void test_DxDiag_DisplayDevices(void) {b3DAccelerationExists, VT_BOOL}, {b3DAccelerationEnabled, VT_BOOL}, {bDDAccelerationEnabled, VT_BOOL}, + {iAdapter, VT_UI4}, }; IDxDiagContainer *display_cont = NULL; @@ -1020,6 +1039,149 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_DxDiag_SoundDevices(void) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; + static const WCHAR empty[] = {0}; + + static const struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szGuidDeviceID, VT_BSTR}, + {szDriverName, VT_BSTR}, + {szDriverPath, VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SoundDevices, &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child, *child2; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + } + + child2 = NULL; + hr = IDxDiagContainer_GetChildContainer(child, empty, &child2); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(child2 != NULL, "Expected child2 != NULL\n"); + ok(child2 != child, "Expected child != child2\n"); + if (hr == S_OK) IDxDiagContainer_Release(child2); + + IDxDiagContainer_Release(child); + } + +cleanup: + if (sound_cont) IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +static void test_DxDiag_SoundCaptureDevices(void) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; + + static const struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szGuidDeviceID, VT_BSTR}, + {szDriverName, VT_BSTR}, + {szDriverPath, VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SoundCaptureDevices, &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + } + IDxDiagContainer_Release(child); + } + +cleanup: + if (sound_cont) IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -1034,5 +1196,7 @@ START_TEST(container) test_root_children(); test_DxDiag_SystemInfo(); test_DxDiag_DisplayDevices(); + test_DxDiag_SoundDevices(); + test_DxDiag_SoundCaptureDevices(); CoUninitialize(); } diff --git a/modules/rostests/winetests/dxdiagn/provider.c b/modules/rostests/winetests/dxdiagn/provider.c index bd30c31c77..2364e2aef8 100644 --- a/modules/rostests/winetests/dxdiagn/provider.c +++ b/modules/rostests/winetests/dxdiagn/provider.c @@ -20,9 +20,9 @@ #define COBJMACROS -#include <initguid.h> -#include <wine/dxdiag.h> -#include <wine/test.h> +#include "initguid.h" +#include "wine/dxdiag.h" +#include "wine/test.h" static void test_Initialize(void) {

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afc3201b402089c5bce59… commit afc3201b402089c5bce59c8cc934c3e40eea41c2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:40:32 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:40:32 2018 +0100 [DXDIAGN] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/dxdiagn/CMakeLists.txt | 4 +- dll/directx/wine/dxdiagn/container.c | 19 +- dll/directx/wine/dxdiagn/dxdiag_main.c | 15 +- dll/directx/wine/dxdiagn/dxdiag_private.h | 25 +-- dll/directx/wine/dxdiagn/dxdiagn.rc | 6 +- dll/directx/wine/dxdiagn/precomp.h | 20 +++ dll/directx/wine/dxdiagn/provider.c | 280 +++++++++++++++++++++++++++++- dll/directx/wine/dxdiagn/resource.h | 2 + media/doc/README.WINE | 2 +- 9 files changed, 335 insertions(+), 38 deletions(-) diff --git a/dll/directx/wine/dxdiagn/CMakeLists.txt b/dll/directx/wine/dxdiagn/CMakeLists.txt index b857773887..7e16a5a07a 100644 --- a/dll/directx/wine/dxdiagn/CMakeLists.txt +++ b/dll/directx/wine/dxdiagn/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND SOURCE container.c dxdiag_main.c provider.c - dxdiag_private.h) + precomp.h) add_library(dxdiagn SHARED ${SOURCE} @@ -20,5 +20,5 @@ set_module_type(dxdiagn win32dll) target_link_libraries(dxdiagn strmiids dxguid uuid wine) add_dependencies(dxdiagn dxdiagn_idlheader) add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 dsound msvcrt kernel32 ntdll) -add_pch(dxdiagn dxdiag_private.h SOURCE) +add_pch(dxdiagn precomp.h SOURCE) add_cd_file(TARGET dxdiagn DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dxdiagn/container.c b/dll/directx/wine/dxdiagn/container.c index dd587c382b..6e068e572d 100644 --- a/dll/directx/wine/dxdiagn/container.c +++ b/dll/directx/wine/dxdiagn/container.c @@ -19,7 +19,14 @@ * */ +#include "config.h" + +#define COBJMACROS #include "dxdiag_private.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static inline IDxDiagContainerImpl *impl_from_IDxDiagContainer(IDxDiagContainer *iface) { @@ -155,6 +162,14 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i if (NULL == tmp) return E_FAIL; lstrcpynW(tmp, pwszContainer, tmp_len); + /* special handling for an empty string and leaf container */ + if (!tmp[0] && list_empty(&pContainer->subContainers)) { + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pContainer, This->pProv, (void **)ppInstance); + if (SUCCEEDED(hr)) + TRACE("Succeeded in getting the container instance\n"); + goto out; + } + cur = strchrW(tmp, '.'); while (NULL != cur) { *cur = '\0'; /* cut tmp string to '.' */ @@ -162,7 +177,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i TRACE("Trying to get parent container %s\n", debugstr_w(tmp)); hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (FAILED(hr)) - goto on_error; + goto out; cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); @@ -176,7 +191,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i TRACE("Succeeded in getting the container instance\n"); } -on_error: +out: HeapFree(GetProcessHeap(), 0, orig_tmp); return hr; } diff --git a/dll/directx/wine/dxdiagn/dxdiag_main.c b/dll/directx/wine/dxdiagn/dxdiag_main.c index 79bc45a8d4..e034b4e595 100644 --- a/dll/directx/wine/dxdiagn/dxdiag_main.c +++ b/dll/directx/wine/dxdiagn/dxdiag_main.c @@ -19,9 +19,22 @@ * */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "oleauto.h" +#include "oleidl.h" +#include "rpcproxy.h" +#include "initguid.h" #include "dxdiag_private.h" +#include "wine/debug.h" -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); HINSTANCE dxdiagn_instance = 0; diff --git a/dll/directx/wine/dxdiagn/dxdiag_private.h b/dll/directx/wine/dxdiagn/dxdiag_private.h index c17505a2f8..7c32a8518a 100644 --- a/dll/directx/wine/dxdiagn/dxdiag_private.h +++ b/dll/directx/wine/dxdiagn/dxdiag_private.h @@ -21,31 +21,16 @@ #ifndef __WINE_DXDIAG_PRIVATE_H #define __WINE_DXDIAG_PRIVATE_H -#include <wine/config.h> - #include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> - -#include <wine/debug.h> -#include <wine/dxdiag.h> -#include <wine/list.h> -#include <wine/unicode.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "wine/list.h" +#include "dxdiag.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); - /* DXDiag Interfaces: */ typedef struct IDxDiagProviderImpl IDxDiagProviderImpl; typedef struct IDxDiagContainerImpl IDxDiagContainerImpl; diff --git a/dll/directx/wine/dxdiagn/dxdiagn.rc b/dll/directx/wine/dxdiagn/dxdiagn.rc index 61e1e05d5f..68e387fbba 100644 --- a/dll/directx/wine/dxdiagn/dxdiagn.rc +++ b/dll/directx/wine/dxdiagn/dxdiagn.rc @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> - #include "resource.h" +#pragma makedep po + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE @@ -37,6 +37,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_PRODUCTVERSION 5,3,1,904 #define WINE_PRODUCTVERSION_STR "5.3.1.904" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" 1 WINE_REGISTRY dxdiagn.rgs diff --git a/dll/directx/wine/dxdiagn/precomp.h b/dll/directx/wine/dxdiagn/precomp.h new file mode 100644 index 0000000000..dcc9acb99c --- /dev/null +++ b/dll/directx/wine/dxdiagn/precomp.h @@ -0,0 +1,20 @@ + +#ifndef __WINE_DXDIAG_PRECOMP_H +#define __WINE_DXDIAG_PRECOMP_H + +#include <wine/config.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "dxdiag_private.h" + +#include <wine/debug.h> +#include <wine/unicode.h> + +#endif /* !__WINE_DXDIAG_PRECOMP_H */ diff --git a/dll/directx/wine/dxdiagn/provider.c b/dll/directx/wine/dxdiagn/provider.c index 638dc23ccb..f0498532f5 100644 --- a/dll/directx/wine/dxdiagn/provider.c +++ b/dll/directx/wine/dxdiagn/provider.c @@ -20,16 +20,29 @@ * */ -#include "dxdiag_private.h" +#include "config.h" -#include <winver.h> -#include <uuids.h> -#include <mmddk.h> -#include <d3d9.h> -#include <fil_data.h> -#include <psapi.h> -#include <wbemcli.h> -#include <dsound.h> +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "dxdiag_private.h" +#include "wine/unicode.h" +#include "winver.h" +#include "objidl.h" +#include "uuids.h" +#include "vfw.h" +#include "mmddk.h" +#include "d3d9.h" +#include "strmif.h" +#include "initguid.h" +#include "fil_data.h" +#include "psapi.h" +#include "wbemcli.h" +#include "dsound.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static const WCHAR szEmpty[] = {0}; @@ -48,6 +61,8 @@ static const WCHAR dwHeight[] = {'d','w','H','e','i','g','h','t',0}; static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; +static const WCHAR szDisplayModeLocalized[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szDisplayModeEnglish[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','E','n','g','l','i','s','h',0}; static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR szDriverVersion[] = {'s','z','D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0}; @@ -57,6 +72,30 @@ static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t',' static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0}; static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0}; static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0}; +static const WCHAR szMonitorName[] = {'s','z','M','o','n','i','t','o','r','N','a','m','e',0}; +static const WCHAR szMonitorMaxRes[] = {'s','z','M','o','n','i','t','o','r','M','a','x','R','e','s',0}; +static const WCHAR szDriverAttributes[] = {'s','z','D','r','i','v','e','r','A','t','t','r','i','b','u','t','e','s',0}; +static const WCHAR szDriverLanguageEnglish[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; +static const WCHAR szDriverLanguageLocalized[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szDriverDateEnglish[] = {'s','z','D','r','i','v','e','r','D','a','t','e','E','n','g','l','i','s','h',0}; +static const WCHAR szDriverDateLocalized[] = {'s','z','D','r','i','v','e','r','D','a','t','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR lDriverSize[] = {'l','D','r','i','v','e','r','S','i','z','e',0}; +static const WCHAR szMiniVdd[] = {'s','z','M','i','n','i','V','d','d',0}; +static const WCHAR szMiniVddDateLocalized[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR szMiniVddDateEnglish[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','E','n','g','l','i','s','h',0}; +static const WCHAR lMiniVddSize[] = {'l','M','i','n','i','V','d','d','S','i','z','e',0}; +static const WCHAR szVdd[] = {'s','z','V','d','d',0}; +static const WCHAR bCanRenderWindow[] = {'b','C','a','n','R','e','n','d','e','r','W','i','n','d','o','w',0}; +static const WCHAR bDriverBeta[] = {'b','D','r','i','v','e','r','B','e','t','a',0}; +static const WCHAR bDriverDebug[] = {'b','D','r','i','v','e','r','D','e','b','u','g',0}; +static const WCHAR bDriverSigned[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d',0}; +static const WCHAR bDriverSignedValid[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d','V','a','l','i','d',0}; +static const WCHAR szDriverSignDate[] = {'s','z','D','r','i','v','e','r','S','i','g','n','D','a','t','e',0}; +static const WCHAR dwDDIVersion[] = {'d','w','D','D','I','V','e','r','s','i','o','n',0}; +static const WCHAR szDDIVersionEnglish[] = {'s','z','D','D','I','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; +static const WCHAR szDDIVersionLocalized[] = {'s','z','D','D','I','V','e','r','s','i','o','n','L','o','c','a','l','i','z','e','d',0}; +static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; +static const WCHAR dwWHQLLevel[] = {'d','w','W','H','Q','L','L','e','v','e','l',0}; struct IDxDiagProviderImpl { @@ -314,6 +353,23 @@ static inline HRESULT add_ui4_property(IDxDiagContainerImpl_Container *node, con return S_OK; } +static inline HRESULT add_i4_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, LONG data) +{ + IDxDiagContainerImpl_Property *prop; + + prop = allocate_property_information(propName); + if (!prop) + return E_OUTOFMEMORY; + + V_VT(&prop->vProp) = VT_I4; + V_I4(&prop->vProp) = data; + + list_add_tail(&node->properties, &prop->entry); + ++node->nProperties; + + return S_OK; +} + static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data) { IDxDiagContainerImpl_Property *prop; @@ -913,6 +969,15 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const WCHAR bNoHardware[] = {'b','N','o','H','a','r','d','w','a','r','e',0}; + static const WCHAR mode_fmtW[] = {'%','d',' ','x',' ','%','d',' ','(','%','d',' ','b','i','t',')',' ','(','%','d','H','z',')',0}; + static const WCHAR gernericPNPMonitorW[] = {'G','e','n','e','r','i','c',' ','P','n','P',' ','M','o','n','i','t','o','r',0}; + static const WCHAR failedToGetParameterW[] = {'F','a','i','l','e','d',' ','t','o',' ','g','e','t',' ','p','a','r','a','m','e','t','e','r',0}; + static const WCHAR driverAttributesW[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; + static const WCHAR englishW[] = {'E','n','g','l','i','s','h',0}; + static const WCHAR driverDateEnglishW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',0}; + static const WCHAR driverDateLocalW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',' ','A','M',0}; + static const WCHAR naW[] = {'n','/','a',0}; + static const WCHAR ddi11W[] = {'1','1',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; @@ -1009,6 +1074,17 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node hr = add_ui4_property(display_adapter, dwBpp, depth_for_pixelformat(adapter_mode.Format)); if (FAILED(hr)) goto cleanup; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), mode_fmtW, adapter_mode.Width, adapter_mode.Height, + depth_for_pixelformat(adapter_mode.Format), adapter_mode.RefreshRate); + + hr = add_bstr_property(display_adapter, szDisplayModeLocalized, buffer); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDisplayModeEnglish, buffer); + if (FAILED(hr)) + goto cleanup; } hr = add_bstr_property(display_adapter, szKeyDeviceKey, szEmpty); @@ -1062,6 +1138,102 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node hr = add_bool_property(display_adapter, bNoHardware, FALSE); if (FAILED(hr)) goto cleanup; + + hr = add_bool_property(display_adapter, bCanRenderWindow, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMonitorName, gernericPNPMonitorW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMonitorMaxRes, failedToGetParameterW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverAttributes, driverAttributesW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverLanguageEnglish, englishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverLanguageLocalized, englishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverDateEnglish, driverDateEnglishW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverDateLocalized, driverDateLocalW); + if (FAILED(hr)) + goto cleanup; + + hr = add_i4_property(display_adapter, lDriverSize, 10 * 1024 * 1024); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVdd, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVddDateLocalized, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szMiniVddDateEnglish, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_i4_property(display_adapter, lMiniVddSize, 0); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szVdd, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverBeta, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverDebug, FALSE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverSigned, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDriverSignedValid, TRUE); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDriverSignDate, naW); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwDDIVersion, 11); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDDIVersionEnglish, ddi11W); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDDIVersionLocalized, ddi11W); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, iAdapter, index); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(display_adapter, dwWHQLLevel, 0); + if (FAILED(hr)) + goto cleanup; } hr = S_OK; @@ -1183,11 +1355,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) return fill_display_information_fallback(node); } +struct enum_context +{ + IDxDiagContainerImpl_Container *cont; + HRESULT hr; + int index; +}; + +static const WCHAR szGUIDFmt[] = +{ + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', + '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2', + 'x','%','0','2','x','%','0','2','x','%','0','2','x',0 +}; + +static LPWSTR guid_to_string(LPWSTR lpwstr, REFGUID lpcguid) +{ + wsprintfW(lpwstr, szGUIDFmt, lpcguid->Data1, lpcguid->Data2, + lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1], + lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4], + lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]); + + return lpwstr; +} + +BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID context) +{ + static const WCHAR deviceid_fmtW[] = {'%','u',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + + struct enum_context *enum_ctx = context; + IDxDiagContainerImpl_Container *device; + WCHAR buffer[256]; + const WCHAR *p, *name; + + /* the default device is enumerated twice, one time without GUID */ + if (!guid) return TRUE; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); + device = allocate_information_node(buffer); + if (!device) + { + enum_ctx->hr = E_OUTOFMEMORY; + return FALSE; + } + + add_subcontainer(enum_ctx->cont, device); + + guid_to_string(buffer, guid); + enum_ctx->hr = add_bstr_property(device, szGuidDeviceID, buffer); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDescription, desc); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDriverPath, module); + if (FAILED(enum_ctx->hr)) + return FALSE; + + name = module; + if ((p = strrchrW(name, '\\'))) name = p + 1; + if ((p = strrchrW(name, '/'))) name = p + 1; + + enum_ctx->hr = add_bstr_property(device, szDriverName, name); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->index++; + return TRUE; +} + static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; + struct enum_context enum_ctx; IDxDiagContainerImpl_Container *cont; cont = allocate_information_node(DxDiag_SoundDevices); @@ -1196,12 +1442,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + cont = allocate_information_node(DxDiag_SoundCaptureDevices); if (!cont) return E_OUTOFMEMORY; add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundCaptureEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + return S_OK; } diff --git a/dll/directx/wine/dxdiagn/resource.h b/dll/directx/wine/dxdiagn/resource.h index 2627a18a66..b2c63510be 100644 --- a/dll/directx/wine/dxdiagn/resource.h +++ b/dll/directx/wine/dxdiagn/resource.h @@ -20,5 +20,7 @@ #pragma once +#include <windef.h> + #define IDS_REGIONAL_SETTING 1 #define IDS_PAGE_FILE_FORMAT 2 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f03769bea8..111a877b04 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -36,7 +36,7 @@ reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to Wine-3.0 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9 reactos/dll/directx/wine/qedit # Synced to Wine-3.0 reactos/dll/directx/wine/quartz # Synced to Wine-3.0

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5313181565b67b6be002… commit a5313181565b67b6be002fb2d7243f858c3741e7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:39:19 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:39:19 2018 +0100 [DPLAYX] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/dplayx/CMakeLists.txt | 4 ++-- dll/directx/wine/dplayx/dpclassfactory.c | 19 ++++++++++++++++++- dll/directx/wine/dplayx/dplay.c | 24 ++++++++++++++++++++++++ dll/directx/wine/dplayx/dplay_global.h | 8 ++++++++ dll/directx/wine/dplayx/dplaysp.c | 13 ++++++++++++- dll/directx/wine/dplayx/dplayx_global.c | 17 +++++++++++++++++ dll/directx/wine/dplayx/dplayx_global.h | 29 ++++------------------------- dll/directx/wine/dplayx/dplayx_main.c | 11 +++++++++-- dll/directx/wine/dplayx/dplayx_messages.c | 14 ++++++++++++++ dll/directx/wine/dplayx/dplayx_messages.h | 15 ++++++++++++--- dll/directx/wine/dplayx/dplayx_queue.h | 5 +++++ dll/directx/wine/dplayx/dplobby.c | 17 +++++++++++++++++ dll/directx/wine/dplayx/lobbysp.c | 7 ++++++- dll/directx/wine/dplayx/lobbysp.h | 9 ++++++++- dll/directx/wine/dplayx/name_server.c | 20 ++++++++++++++++++-- dll/directx/wine/dplayx/name_server.h | 9 +++++++++ dll/directx/wine/dplayx/precomp.h | 23 +++++++++++++++++++++++ media/doc/README.WINE | 2 +- 18 files changed, 207 insertions(+), 39 deletions(-) diff --git a/dll/directx/wine/dplayx/CMakeLists.txt b/dll/directx/wine/dplayx/CMakeLists.txt index bf9a7ed46c..867ba69001 100644 --- a/dll/directx/wine/dplayx/CMakeLists.txt +++ b/dll/directx/wine/dplayx/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE dplobby.c lobbysp.c name_server.c - dplayx_global.h) + precomp.h) add_library(dplayx SHARED ${SOURCE} @@ -26,5 +26,5 @@ add_library(dplayx SHARED set_module_type(dplayx win32dll) target_link_libraries(dplayx dxguid uuid wine) add_importlibs(dplayx winmm ole32 user32 advapi32 msvcrt kernel32 ntdll) -add_pch(dplayx dplayx_global.h SOURCE) +add_pch(dplayx precomp.h SOURCE) add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dplayx/dpclassfactory.c b/dll/directx/wine/dplayx/dpclassfactory.c index e2300dd5c2..6accab68d7 100644 --- a/dll/directx/wine/dplayx/dpclassfactory.c +++ b/dll/directx/wine/dplayx/dpclassfactory.c @@ -17,7 +17,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dplayx_global.h" +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" +#include "winerror.h" +#include "wine/debug.h" +#include "dplay.h" +#include "dplobby.h" +#include "initguid.h" +#include "dplay_global.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + typedef struct { diff --git a/dll/directx/wine/dplayx/dplay.c b/dll/directx/wine/dplayx/dplay.c index a08c13e600..fde068138e 100644 --- a/dll/directx/wine/dplayx/dplay.c +++ b/dll/directx/wine/dplayx/dplay.c @@ -17,7 +17,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <string.h> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winerror.h" +#include "winbase.h" +#include "winnt.h" +#include "winreg.h" +#include "winnls.h" +#include "wine/unicode.h" +#include "wine/debug.h" + #include "dplayx_global.h" +#include "name_server.h" +#include "dplayx_queue.h" +#include "wine/dplaysp.h" +#include "dplay_global.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* FIXME: Should this be externed? */ extern HRESULT DPL_CreateCompoundAddress diff --git a/dll/directx/wine/dplayx/dplay_global.h b/dll/directx/wine/dplayx/dplay_global.h index f5473d0f43..7def46bc2d 100644 --- a/dll/directx/wine/dplayx/dplay_global.h +++ b/dll/directx/wine/dplayx/dplay_global.h @@ -19,6 +19,14 @@ #ifndef __WINE_DPLAY_GLOBAL_INCLUDED #define __WINE_DPLAY_GLOBAL_INCLUDED +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/dplaysp.h" +#include "lobbysp.h" +#include "dplayx_queue.h" + extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/dplayx/dplaysp.c b/dll/directx/wine/dplayx/dplaysp.c index 2322a311d0..43938e8511 100644 --- a/dll/directx/wine/dplayx/dplaysp.c +++ b/dll/directx/wine/dplayx/dplaysp.c @@ -18,10 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dplayx_global.h" +#include <string.h> +#include "winerror.h" +#include "wine/debug.h" + +#include "wine/dplaysp.h" +#include "dplay_global.h" +#include "name_server.h" +#include "dplayx_messages.h" + +#include "dplayx_global.h" /* FIXME: For global hack */ /* FIXME: Need to add interface locking inside procedures */ +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + typedef struct IDirectPlaySPImpl { IDirectPlaySP IDirectPlaySP_iface; diff --git a/dll/directx/wine/dplayx/dplayx_global.c b/dll/directx/wine/dplayx/dplayx_global.c index dcc021a6e4..14c53a0c8d 100644 --- a/dll/directx/wine/dplayx/dplayx_global.c +++ b/dll/directx/wine/dplayx/dplayx_global.c @@ -29,7 +29,24 @@ * */ +#include <stdarg.h> +#include <string.h> + +#define NONAMELESSUNION + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wine/unicode.h" + +#include "wingdi.h" +#include "winuser.h" + #include "dplayx_global.h" +#include "dplayx_messages.h" /* For CreateMessageReceptionThread only */ + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* FIXME: Need to do all that fun other dll referencing type of stuff */ diff --git a/dll/directx/wine/dplayx/dplayx_global.h b/dll/directx/wine/dplayx/dplayx_global.h index e388e077f6..848771bced 100644 --- a/dll/directx/wine/dplayx/dplayx_global.h +++ b/dll/directx/wine/dplayx/dplayx_global.h @@ -19,33 +19,12 @@ #ifndef __WINE_DPLAYX_GLOBAL #define __WINE_DPLAYX_GLOBAL -#include <wine/config.h> - #include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <dplay.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -#include "dplaysp.h" -#include "lobbysp.h" -#include "dplayx_queue.h" -#include "dplay_global.h" -#include "dplayx_messages.h" -#include "name_server.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "dplay.h" BOOL DPLAYX_ConstructData(void) DECLSPEC_HIDDEN; BOOL DPLAYX_DestructData(void) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/dplayx/dplayx_main.c b/dll/directx/wine/dplayx/dplayx_main.c index 423ee70ead..b1076ff2f6 100644 --- a/dll/directx/wine/dplayx/dplayx_main.c +++ b/dll/directx/wine/dplayx/dplayx_main.c @@ -56,10 +56,17 @@ * client. Also get rid of offset dependency by making data offset independent * somehow. */ - +#include <stdarg.h> + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" #include "dplayx_global.h" -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(dplay); static HINSTANCE instance; diff --git a/dll/directx/wine/dplayx/dplayx_messages.c b/dll/directx/wine/dplayx/dplayx_messages.c index 8318d4adfa..6f6636c4b9 100644 --- a/dll/directx/wine/dplayx/dplayx_messages.c +++ b/dll/directx/wine/dplayx/dplayx_messages.c @@ -20,7 +20,21 @@ * o Messaging interface required for both DirectPlay and DirectPlayLobby. */ +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" + +#include "dplayx_messages.h" +#include "dplay_global.h" #include "dplayx_global.h" +#include "name_server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct tagMSGTHREADINFO { diff --git a/dll/directx/wine/dplayx/dplayx_messages.h b/dll/directx/wine/dplayx/dplayx_messages.h index 755f8bec6f..c6f7f8af57 100644 --- a/dll/directx/wine/dplayx/dplayx_messages.h +++ b/dll/directx/wine/dplayx/dplayx_messages.h @@ -19,6 +19,15 @@ #ifndef __WINE_DPLAYX_MESSAGES__ #define __WINE_DPLAYX_MESSAGES__ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "dplay.h" +#include "rpc.h" /* For GUID */ + +#include "dplay_global.h" + DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN; @@ -39,7 +48,7 @@ void DP_MSG_ToSelf( IDirectPlayImpl *This, DPID dpidSelf ) DECLSPEC_HIDDEN; #define DPMSG_DEFAULT_WAIT_TIME DPMSG_WAIT_30_SECS /* Message types etc. */ -#include <pshpack1.h> +#include "pshpack1.h" /* Non provided messages for DPLAY - guess work which may be wrong :( */ #define DPMSGCMD_ENUMSESSIONSREPLY 1 @@ -209,6 +218,6 @@ typedef struct tagDPMSG_FORWARDADDPLAYERNACK } DPMSG_FORWARDADDPLAYERNACK, *LPDPMSG_FORWARDADDPLAYERNACK; typedef const DPMSG_FORWARDADDPLAYERNACK* LPCDPMSG_FORWARDADDPLAYERNACK; -#include <poppack.h> +#include "poppack.h" -#endif /* __WINE_DPLAYX_MESSAGES__ */ +#endif diff --git a/dll/directx/wine/dplayx/dplayx_queue.h b/dll/directx/wine/dplayx/dplayx_queue.h index 3cd4f0be5f..e704d9a707 100644 --- a/dll/directx/wine/dplayx/dplayx_queue.h +++ b/dll/directx/wine/dplayx/dplayx_queue.h @@ -26,6 +26,11 @@ #ifndef __WINE_DPLAYX_QUEUE_H #define __WINE_DPLAYX_QUEUE_H +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + #define DPQ_INSERT(a,b,c) DPQ_INSERT_IN_TAIL(a,b,c) /* diff --git a/dll/directx/wine/dplayx/dplobby.c b/dll/directx/wine/dplayx/dplobby.c index 58536d8766..944fea9ec6 100644 --- a/dll/directx/wine/dplayx/dplobby.c +++ b/dll/directx/wine/dplayx/dplobby.c @@ -16,8 +16,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" +#include "winnls.h" +#include "wine/debug.h" #include "dplayx_global.h" +#include "dplayx_messages.h" +#include "dplayx_queue.h" +#include "dplobby.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, diff --git a/dll/directx/wine/dplayx/lobbysp.c b/dll/directx/wine/dplayx/lobbysp.c index 7b1da09cf1..3528f94e34 100644 --- a/dll/directx/wine/dplayx/lobbysp.c +++ b/dll/directx/wine/dplayx/lobbysp.c @@ -18,8 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dplayx_global.h" +#include "winerror.h" +#include "wine/debug.h" +#include "lobbysp.h" +#include "dplay_global.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct IDPLobbySPImpl { diff --git a/dll/directx/wine/dplayx/lobbysp.h b/dll/directx/wine/dplayx/lobbysp.h index 2a214a91df..8d871160b6 100644 --- a/dll/directx/wine/dplayx/lobbysp.h +++ b/dll/directx/wine/dplayx/lobbysp.h @@ -19,6 +19,13 @@ #ifndef __WINE_LOBBY_SP_H #define __WINE_LOBBY_SP_H +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "dplobby.h" + /* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */ DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20, 0x2ced, 0x11d0, 0xa8, 0x89, 0x0, 0xa0, 0xc9, 0x5, 0x43, 0x3c); typedef struct IDPLobbySP *LPDPLOBBYSP; @@ -509,4 +516,4 @@ DECLARE_INTERFACE_(IDPLobbySP,IUnknown) */ extern DWORD gdwDPlaySPRefCount DECLSPEC_HIDDEN; -#endif /* __WINE_LOBBY_SP_H */ +#endif diff --git a/dll/directx/wine/dplayx/name_server.c b/dll/directx/wine/dplayx/name_server.c index 2566c3699f..7ca1500bfb 100644 --- a/dll/directx/wine/dplayx/name_server.c +++ b/dll/directx/wine/dplayx/name_server.c @@ -19,12 +19,28 @@ /* NOTE: Methods with the NS_ prefix are name server methods */ -#include "dplayx_global.h" +#include <stdarg.h> +#include <string.h> + +#define NONAMELESSUNION -#include <mmsystem.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wine/unicode.h" +#include "wine/debug.h" +#include "mmsystem.h" + +#include "dplayx_global.h" +#include "name_server.h" +#include "wine/dplaysp.h" +#include "dplayx_messages.h" +#include "dplayx_queue.h" /* FIXME: Need to create a crit section, store and use it */ +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + /* NS specific structures */ struct NSCacheData { diff --git a/dll/directx/wine/dplayx/name_server.h b/dll/directx/wine/dplayx/name_server.h index 6213cceef9..2ad012c2fa 100644 --- a/dll/directx/wine/dplayx/name_server.h +++ b/dll/directx/wine/dplayx/name_server.h @@ -19,6 +19,15 @@ #ifndef __WINE_DPLAYX_NAMESERVER #define __WINE_DPLAYX_NAMESERVER +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "dplay.h" +#include "wine/dplaysp.h" +#include "dplayx_messages.h" +#include "dplay_global.h" + void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) DECLSPEC_HIDDEN; void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr, DWORD dwHdrSize, diff --git a/dll/directx/wine/dplayx/precomp.h b/dll/directx/wine/dplayx/precomp.h new file mode 100644 index 0000000000..ac5ab0cc8a --- /dev/null +++ b/dll/directx/wine/dplayx/precomp.h @@ -0,0 +1,23 @@ + +#ifndef __WINE_DPLAYX_PRECOMP_H +#define __WINE_DPLAYX_PRECOMP_H + +#include <wine/config.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "dplay_global.h" +#include "dplayx_global.h" +#include "dplayx_messages.h" +#include "name_server.h" + +#include <winreg.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +#endif /* !__WINE_DPLAYX_PRECOMP_H */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 625b7eb0e9..f03769bea8 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput # Synced to WineStaging-3.3 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3 reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to Wine-3.0 reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2608d3861992e5a1ac80c… commit 2608d3861992e5a1ac80c6ff4f3c0e7cbe1ad0f5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:38:10 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:38:10 2018 +0100 [DPLAY] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/dplay/version.rc | 2 +- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/dplay/version.rc b/dll/directx/wine/dplay/version.rc index ed04c977ea..f52c09ca4f 100644 --- a/dll/directx/wine/dplay/version.rc +++ b/dll/directx/wine/dplay/version.rc @@ -24,4 +24,4 @@ #define WINE_PRODUCTVERSION_STR "5.3" #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 352808564a..625b7eb0e9 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -33,7 +33,7 @@ reactos/dll/directx/wine/devenum # Synced to WineStaging-3.3 reactos/dll/directx/wine/dinput # Synced to WineStaging-3.3 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3 reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3 -reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9 +reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to Wine-3.0

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d870f5ba6cc89adf0f34… commit 5d870f5ba6cc89adf0f3429599cb19b253607cf2 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:36:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:36:52 2018 +0100 [DMUSIC] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/dmusic/CMakeLists.txt | 4 ++-- dll/directx/wine/dmusic/buffer.c | 4 +++- dll/directx/wine/dmusic/clock.c | 2 ++ dll/directx/wine/dmusic/collection.c | 4 ++-- dll/directx/wine/dmusic/dmobject.c | 8 ++++++- dll/directx/wine/dmusic/dmusic.c | 5 +++-- dll/directx/wine/dmusic/dmusic_main.c | 22 +++++++++++++++++-- dll/directx/wine/dmusic/dmusic_private.h | 36 ++++++++++++++------------------ dll/directx/wine/dmusic/download.c | 2 ++ dll/directx/wine/dmusic/instrument.c | 2 ++ dll/directx/wine/dmusic/port.c | 3 ++- dll/directx/wine/dmusic/precomp.h | 14 +++++++++++++ dll/directx/wine/dmusic/version.rc | 2 +- media/doc/README.WINE | 2 +- 14 files changed, 77 insertions(+), 33 deletions(-) diff --git a/dll/directx/wine/dmusic/CMakeLists.txt b/dll/directx/wine/dmusic/CMakeLists.txt index fbb71ded91..fe4c270680 100644 --- a/dll/directx/wine/dmusic/CMakeLists.txt +++ b/dll/directx/wine/dmusic/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND SOURCE download.c instrument.c port.c - dmusic_private.h) + precomp.h) add_library(dmusic SHARED ${SOURCE} @@ -23,5 +23,5 @@ add_library(dmusic SHARED set_module_type(dmusic win32dll) target_link_libraries(dmusic dxguid uuid wine) add_importlibs(dmusic ole32 advapi32 winmm dsound user32 msvcrt kernel32 ntdll) -add_pch(dmusic dmusic_private.h SOURCE) +add_pch(dmusic precomp.h SOURCE) add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dmusic/buffer.c b/dll/directx/wine/dmusic/buffer.c index 404200c46f..9b0ca848a6 100644 --- a/dll/directx/wine/dmusic/buffer.c +++ b/dll/directx/wine/dmusic/buffer.c @@ -20,8 +20,10 @@ */ #include "dmusic_private.h" +#include "initguid.h" +#include "dmksctrl.h" -#include <dmksctrl.h> +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface) { diff --git a/dll/directx/wine/dmusic/clock.c b/dll/directx/wine/dmusic/clock.c index 58f9352875..2086bfa3f1 100644 --- a/dll/directx/wine/dmusic/clock.c +++ b/dll/directx/wine/dmusic/clock.c @@ -20,6 +20,8 @@ #include "dmusic_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); + static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface); diff --git a/dll/directx/wine/dmusic/collection.c b/dll/directx/wine/dmusic/collection.c index e2c53a86c5..ec9914faa1 100644 --- a/dll/directx/wine/dmusic/collection.c +++ b/dll/directx/wine/dmusic/collection.c @@ -19,9 +19,9 @@ */ #include "dmusic_private.h" +#include "dmobject.h" -#include <dmusicf.h> - +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** diff --git a/dll/directx/wine/dmusic/dmobject.c b/dll/directx/wine/dmusic/dmobject.c index 8f0441b7d6..cabb6f74db 100644 --- a/dll/directx/wine/dmusic/dmobject.c +++ b/dll/directx/wine/dmusic/dmobject.c @@ -20,7 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmusic_private.h" +#define COBJMACROS +#include "objbase.h" +#include "dmusici.h" +#include "dmobject.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dmobj); /* Generic IDirectMusicObject methods */ static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface) diff --git a/dll/directx/wine/dmusic/dmusic.c b/dll/directx/wine/dmusic/dmusic.c index bfc13b893b..58dcd9d952 100644 --- a/dll/directx/wine/dmusic/dmusic.c +++ b/dll/directx/wine/dmusic/dmusic.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> + #include "dmusic_private.h" -#include <winuser.h> -#include <winreg.h> +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) { diff --git a/dll/directx/wine/dmusic/dmusic_main.c b/dll/directx/wine/dmusic/dmusic_main.c index 3aae6168dd..da6f45869d 100644 --- a/dll/directx/wine/dmusic/dmusic_main.c +++ b/dll/directx/wine/dmusic/dmusic_main.c @@ -17,10 +17,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmusic_private.h" +#include "config.h" +#include "wine/port.h" #include <stdio.h> -#include <rpcproxy.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmusic_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static HINSTANCE instance; LONG DMUSIC_refCount = 0; diff --git a/dll/directx/wine/dmusic/dmusic_private.h b/dll/directx/wine/dmusic/dmusic_private.h index 2ba5e7462e..f9839edfda 100644 --- a/dll/directx/wine/dmusic/dmusic_private.h +++ b/dll/directx/wine/dmusic/dmusic_private.h @@ -22,32 +22,28 @@ #ifndef __WINE_DMUSIC_PRIVATE_H #define __WINE_DMUSIC_PRIVATE_H -#include <wine/config.h> - #include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <dmusici.h> -#include <dmusics.h> -#include <dmksctrl.h> - -#include <wine/debug.h> -#include <wine/list.h> -#include <wine/unicode.h> - -#include "dmobject.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" +#include "winreg.h" +#include "objbase.h" + +#include "dmusici.h" +#include "dmusicf.h" +#include "dmusics.h" +#include "dmksctrl.h" /***************************************************************************** * Interfaces diff --git a/dll/directx/wine/dmusic/download.c b/dll/directx/wine/dmusic/download.c index cc18c20123..a88ec2c584 100644 --- a/dll/directx/wine/dmusic/download.c +++ b/dll/directx/wine/dmusic/download.c @@ -20,6 +20,8 @@ #include "dmusic_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); + static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface) { return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface); diff --git a/dll/directx/wine/dmusic/instrument.c b/dll/directx/wine/dmusic/instrument.c index 2a34189013..87b31c1ed6 100644 --- a/dll/directx/wine/dmusic/instrument.c +++ b/dll/directx/wine/dmusic/instrument.c @@ -20,6 +20,8 @@ #include "dmusic_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); + static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, { 0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } }; /* IDirectMusicInstrument IUnknown part: */ diff --git a/dll/directx/wine/dmusic/port.c b/dll/directx/wine/dmusic/port.c index af5eafbf45..50646153a7 100644 --- a/dll/directx/wine/dmusic/port.c +++ b/dll/directx/wine/dmusic/port.c @@ -19,9 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "dmusic_private.h" -#include <assert.h> +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); typedef struct SynthPortImpl { IDirectMusicPort IDirectMusicPort_iface; diff --git a/dll/directx/wine/dmusic/precomp.h b/dll/directx/wine/dmusic/precomp.h new file mode 100644 index 0000000000..acdbe9a0ab --- /dev/null +++ b/dll/directx/wine/dmusic/precomp.h @@ -0,0 +1,14 @@ + +#ifndef __WINE_DMUSIC_PRECOMP_H +#define __WINE_DMUSIC_PRECOMP_H + +#include <wine/config.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include "dmusic_private.h" +#include "dmobject.h" + +#endif /* !__WINE_DMUSIC_PRECOMP_H */ diff --git a/dll/directx/wine/dmusic/version.rc b/dll/directx/wine/dmusic/version.rc index f7cd58750c..89292ecde6 100644 --- a/dll/directx/wine/dmusic/version.rc +++ b/dll/directx/wine/dmusic/version.rc @@ -26,4 +26,4 @@ #define WINE_PRODUCTVERSION_STR "5.3.1.904" #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 0c6dba68ad..352808564a 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.3 reactos/dll/directx/wine/devenum # Synced to WineStaging-3.3 reactos/dll/directx/wine/dinput # Synced to WineStaging-3.3 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3 -reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8c6acd13de30cdffe456… commit e8c6acd13de30cdffe4564ad6fa84dec266f3557 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:35:22 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:35:22 2018 +0100 [DINPUT8] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/dinput8/dinput8_main.c | 27 ++++++++++++--------------- dll/directx/wine/dinput8/version.rc | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dll/directx/wine/dinput8/dinput8_main.c b/dll/directx/wine/dinput8/dinput8_main.c index 7eef166b78..9824c76446 100644 --- a/dll/directx/wine/dinput8/dinput8_main.c +++ b/dll/directx/wine/dinput8/dinput8_main.c @@ -18,23 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/config.h> -//#include <assert.h> -//#include <stdarg.h> -//#include <string.h> +#include "config.h" +#include <assert.h> +#include <stdarg.h> +#include <string.h> #define COBJMACROS -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <wine/debug.h> -//#include "windef.h" -#include <winbase.h> -//#include "winerror.h" -#include <objbase.h> -#include <rpcproxy.h> -#include <dinput.h> + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "dinput.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); diff --git a/dll/directx/wine/dinput8/version.rc b/dll/directx/wine/dinput8/version.rc index b319f29768..e986b7ceba 100644 --- a/dll/directx/wine/dinput8/version.rc +++ b/dll/directx/wine/dinput8/version.rc @@ -25,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,1,2600,881 #define WINE_PRODUCTVERSION_STR "5.1" -#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 ef1c4aca21..0c6dba68ad 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -31,7 +31,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3 reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.3 reactos/dll/directx/wine/devenum # Synced to WineStaging-3.3 reactos/dll/directx/wine/dinput # Synced to WineStaging-3.3 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-2.9 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3 reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16

6 years, 6 months

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

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32675648dc0abb7d50800… commit 32675648dc0abb7d508008fee51ca4b6daa1a69a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Thu Mar 8 13:34:24 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Thu Mar 8 13:34:24 2018 +0100 [DINPUT_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/dinput/device.c | 9 ++++++++- modules/rostests/winetests/dinput/dinput.c | 8 +++++++- modules/rostests/winetests/dinput/joystick.c | 13 +++++++++++-- modules/rostests/winetests/dinput/keyboard.c | 14 +++++++++++++- modules/rostests/winetests/dinput/mouse.c | 12 +++++++++++- modules/rostests/winetests/dinput/precomp.h | 10 ++++------ 6 files changed, 54 insertions(+), 12 deletions(-) diff --git a/modules/rostests/winetests/dinput/device.c b/modules/rostests/winetests/dinput/device.c index 605b091480..74940248ff 100644 --- a/modules/rostests/winetests/dinput/device.c +++ b/modules/rostests/winetests/dinput/device.c @@ -16,7 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +#include <windows.h> + +#include "wine/test.h" +#include "windef.h" +#include "dinput.h" static const DIOBJECTDATAFORMAT obj_data_format[] = { { &GUID_YAxis, 16, DIDFT_OPTIONAL|DIDFT_AXIS |DIDFT_MAKEINSTANCE(1), 0}, diff --git a/modules/rostests/winetests/dinput/dinput.c b/modules/rostests/winetests/dinput/dinput.c index b4f36402d2..a5f7c0cfce 100644 --- a/modules/rostests/winetests/dinput/dinput.c +++ b/modules/rostests/winetests/dinput/dinput.c @@ -16,10 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define DIRECTINPUT_VERSION 0x0700 +#define COBJMACROS +#include <initguid.h> +#include <windows.h> +#include <dinput.h> #include <dinputd.h> +#include "wine/test.h" + HINSTANCE hInstance; enum directinput_versions diff --git a/modules/rostests/winetests/dinput/joystick.c b/modules/rostests/winetests/dinput/joystick.c index 6649023056..b4ffba5c5d 100644 --- a/modules/rostests/winetests/dinput/joystick.c +++ b/modules/rostests/winetests/dinput/joystick.c @@ -16,10 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define DIRECTINPUT_VERSION 0x0700 +#define COBJMACROS +#include <windows.h> + +#include <math.h> #include <stdio.h> -#include <winnls.h> +#include <stdlib.h> + +#include "wine/test.h" +#include "windef.h" +#include "wingdi.h" +#include "dinput.h" #define numObjects(x) (sizeof(x) / sizeof(x[0])) diff --git a/modules/rostests/winetests/dinput/keyboard.c b/modules/rostests/winetests/dinput/keyboard.c index 6df1028a32..e51e332535 100644 --- a/modules/rostests/winetests/dinput/keyboard.c +++ b/modules/rostests/winetests/dinput/keyboard.c @@ -16,7 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define DIRECTINPUT_VERSION 0x0700 + +#define COBJMACROS +#include <windows.h> + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +#include "wine/test.h" +#include "windef.h" +#include "wingdi.h" +#include "dinput.h" static void acquire_tests(IDirectInputA *pDI, HWND hwnd) { diff --git a/modules/rostests/winetests/dinput/mouse.c b/modules/rostests/winetests/dinput/mouse.c index 791300db2d..7f71b6e6e7 100644 --- a/modules/rostests/winetests/dinput/mouse.c +++ b/modules/rostests/winetests/dinput/mouse.c @@ -17,8 +17,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#define DIRECTINPUT_VERSION 0x0700 +#define COBJMACROS +#include <windows.h> + +#include <math.h> +#include <stdlib.h> + +#include "wine/test.h" +#include "windef.h" +#include "wingdi.h" +#include "dinput.h" static const HRESULT SetCoop_null_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, diff --git a/modules/rostests/winetests/dinput/precomp.h b/modules/rostests/winetests/dinput/precomp.h index 131fdabfe8..103761a4ba 100644 --- a/modules/rostests/winetests/dinput/precomp.h +++ b/modules/rostests/winetests/dinput/precomp.h @@ -1,17 +1,15 @@ + #ifndef _DINPUT_WINETEST_PRECOMP_H_ #define _DINPUT_WINETEST_PRECOMP_H_ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define DIRECTINPUT_VERSION 0x0700 +#define WIN32_NO_STATUS #define COBJMACROS -#include <wine/test.h> - #include <initguid.h> +#include <windows.h> +#include <wine/test.h> #include <dinput.h> #endif /* !_DINPUT_WINETEST_PRECOMP_H_ */

6 years, 6 months

← Newer
1
...
35
36
37
38
39
40
41
...
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