https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e18d6bc62bf6f69560601ea13c353e9dc480f48
commit 0e18d6bc62bf6f69560601ea13c353e9dc480f48 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Nov 9 21:54:42 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Nov 9 21:54:42 2019 +0100 [MMDEVAPI] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/mmdevapi/audiovolume.c | 2 -- dll/win32/mmdevapi/devenum.c | 7 ++----- dll/win32/mmdevapi/main.c | 7 +------ dll/win32/mmdevapi/mmdevapi.h | 4 ---- dll/win32/mmdevapi/precomp.h | 5 +---- media/doc/README.WINE | 2 +- 6 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dll/win32/mmdevapi/audiovolume.c b/dll/win32/mmdevapi/audiovolume.c index 76f9f4ec1e5..24d210a1c85 100644 --- a/dll/win32/mmdevapi/audiovolume.c +++ b/dll/win32/mmdevapi/audiovolume.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -26,7 +25,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "ole2.h" #include "mmdeviceapi.h" diff --git a/dll/win32/mmdevapi/devenum.c b/dll/win32/mmdevapi/devenum.c index 685ec27de62..82e1bb96c2a 100644 --- a/dll/win32/mmdevapi/devenum.c +++ b/dll/win32/mmdevapi/devenum.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define NONAMELESSUNION @@ -28,7 +26,6 @@ #include "winreg.h" #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "initguid.h" #include "ole2.h" @@ -448,7 +445,7 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (strlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); memcpy(name, pv.u.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, @@ -1431,7 +1428,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR RegCloseKey(propkey); buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[39]); + key->pid = wcstol(&buffer[39], NULL, 10); return S_OK; } diff --git a/dll/win32/mmdevapi/main.c b/dll/win32/mmdevapi/main.c index 8886975c96a..7680b451381 100644 --- a/dll/win32/mmdevapi/main.c +++ b/dll/win32/mmdevapi/main.c @@ -17,16 +17,12 @@ * 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" @@ -44,7 +40,6 @@ #include "mmdevapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -139,7 +134,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) TRACE("Loading driver list %s\n", wine_dbgstr_w(driver_list)); for(next = p = driver_list; next; p = next + 1){ - next = strchrW(p, ','); + next = wcschr(p, ','); if(next) *next = '\0'; diff --git a/dll/win32/mmdevapi/mmdevapi.h b/dll/win32/mmdevapi/mmdevapi.h index ecf44c6e9f6..18971893d22 100644 --- a/dll/win32/mmdevapi/mmdevapi.h +++ b/dll/win32/mmdevapi/mmdevapi.h @@ -18,10 +18,6 @@ #pragma once -#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; diff --git a/dll/win32/mmdevapi/precomp.h b/dll/win32/mmdevapi/precomp.h index 9d554feba06..17fb891552b 100644 --- a/dll/win32/mmdevapi/precomp.h +++ b/dll/win32/mmdevapi/precomp.h @@ -2,9 +2,6 @@ #ifndef _MMDEVAPI_PRECOMP_H_ #define _MMDEVAPI_PRECOMP_H_ -#include <wine/config.h> -#include <wine/port.h> - #include <stdarg.h> #define WIN32_NO_STATUS @@ -18,13 +15,13 @@ #include <winbase.h> #include <wingdi.h> #include <winreg.h> +#include <winnls.h> #include <objbase.h> #include <audiopolicy.h> #include <endpointvolume.h> #include <mmdeviceapi.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "mmdevapi.h" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 52895acaf07..6155fe247c6 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -98,7 +98,7 @@ dll/win32/mciseq # Synced to WineStaging-4.18 dll/win32/mciwave # Synced to WineStaging-4.18 dll/win32/mgmtapi # Synced to WineStaging-3.3 dll/win32/mlang # Synced to WineStaging-4.18 -dll/win32/mmdevapi # Synced to WineStaging-4.0 +dll/win32/mmdevapi # Synced to WineStaging-4.18 dll/win32/mpr # Synced to WineStaging-3.17 dll/win32/mprapi # Synced to WineStaging-3.3 dll/win32/msacm32 # Synced to WineStaging-4.0
