Alexandre Julliard : mmdevapi: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Tue Jun 11 16:54:05 CDT 2019
Module: wine
Branch: master
Commit: eae787f9134340d27e8a41c45fbb6dddf2b41e0e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae787f9134340d27e8a41c45fbb6dddf2b41e0e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 11 08:27:51 2019 +0200
mmdevapi: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mmdevapi/Makefile.in | 2 ++
dlls/mmdevapi/audiovolume.c | 2 --
dlls/mmdevapi/devenum.c | 7 ++-----
dlls/mmdevapi/main.c | 7 +------
dlls/mmdevapi/mmdevapi.h | 4 ----
5 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in
index 530f767..5f44f7b 100644
--- a/dlls/mmdevapi/Makefile.in
+++ b/dlls/mmdevapi/Makefile.in
@@ -1,6 +1,8 @@
MODULE = mmdevapi.dll
IMPORTS = uuid ole32 oleaut32 user32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
audiovolume.c \
devenum.c \
diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c
index 76f9f4e..24d210a 100644
--- a/dlls/mmdevapi/audiovolume.c
+++ b/dlls/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/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index 685ec27..82e1bb9 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/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/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index 8886975..7680b45 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/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/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h
index b85c757..bc9788e 100644
--- a/dlls/mmdevapi/mmdevapi.h
+++ b/dlls/mmdevapi/mmdevapi.h
@@ -16,10 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#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;
More information about the wine-cvs
mailing list