ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmdevapi: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-11 08:27:51 +02:00
parent ca0f73c0ce
commit eae787f913
5 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mmdevapi/Makefile.in
View File

@ -1,6 +1,8 @@
MODULE = mmdevapi.dll MODULE = mmdevapi.dll
IMPORTS = uuid ole32 oleaut32 user32 advapi32 IMPORTS = uuid ole32 oleaut32 user32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
audiovolume.c \ audiovolume.c \
devenum.c \ devenum.c \

2
dlls/mmdevapi/audiovolume.c
View File

@ -17,7 +17,6 @@
*/ */
#define COBJMACROS #define COBJMACROS
#include "config.h"
#include <stdarg.h> #include <stdarg.h>
@ -26,7 +25,6 @@
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "ole2.h" #include "ole2.h"
#include "mmdeviceapi.h" #include "mmdeviceapi.h"

7
dlls/mmdevapi/devenum.c
View File

@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <stdarg.h> #include <stdarg.h>
#define NONAMELESSUNION #define NONAMELESSUNION
@ -28,7 +26,6 @@
#include "winreg.h" #include "winreg.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/unicode.h"
#include "initguid.h" #include "initguid.h"
#include "ole2.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)) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv))
&& pv.vt == VT_LPWSTR) && 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); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes);
memcpy(name, pv.u.pwszVal, size_bytes); memcpy(name, pv.u.pwszVal, size_bytes);
MMDevice_Create(name, &guid, curflow, MMDevice_Create(name, &guid, curflow,
@ -1431,7 +1428,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR
RegCloseKey(propkey); RegCloseKey(propkey);
buffer[38] = 0; buffer[38] = 0;
CLSIDFromString(buffer, &key->fmtid); CLSIDFromString(buffer, &key->fmtid);
key->pid = atoiW(&buffer[39]); key->pid = wcstol(&buffer[39], NULL, 10);
return S_OK; return S_OK;
} }

7
dlls/mmdevapi/main.c
View File

@ -17,16 +17,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/library.h"
#include "ole2.h" #include "ole2.h"
#include "olectl.h" #include "olectl.h"
@ -44,7 +40,6 @@
#include "mmdevapi.h" #include "mmdevapi.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); 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)); TRACE("Loading driver list %s\n", wine_dbgstr_w(driver_list));
for(next = p = driver_list; next; p = next + 1){ for(next = p = driver_list; next; p = next + 1){
next = strchrW(p, ','); next = wcschr(p, ',');
if(next) if(next)
*next = '\0'; *next = '\0';

4
dlls/mmdevapi/mmdevapi.h
View File

@ -16,10 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;