Module: wine Branch: master Commit: b5d2b70dff4f4c0042b87991857c45dadfc39f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d2b70dff4f4c0042b879918...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Jun 12 09:43:56 2019 +0200
msdmo: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msdmo/Makefile.in | 2 ++ dlls/msdmo/dmoreg.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 566461e..798ed70 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -2,6 +2,8 @@ MODULE = msdmo.dll IMPORTLIB = msdmo IMPORTS = dmoguids uuid ole32 user32 advapi32
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmoreg.c \ dmort.c diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 1c06bbf..34532f5 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -27,7 +27,6 @@ #include "winerror.h" #include "winreg.h" #include "objbase.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dmo.h"
@@ -121,7 +120,7 @@ static HRESULT string_to_guid(const WCHAR *string, GUID *guid) { WCHAR buffer[39]; buffer[0] = '{'; - strcpyW(buffer + 1, string); + lstrcpyW(buffer + 1, string); buffer[37] = '}'; buffer[38] = 0; return CLSIDFromString(buffer, guid); @@ -218,7 +217,7 @@ HRESULT WINAPI DMORegister(
/* Set default Name value */ ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, - (strlenW(szName) + 1) * sizeof(WCHAR)); + (lstrlenW(szName) + 1) * sizeof(WCHAR));
/* Set InputTypes */ hres = write_types(hkey, szDMOInputType, pInTypes, cInTypes); @@ -663,9 +662,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( Names[count] = NULL; if (ret == ERROR_SUCCESS) { - Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); + Names[count] = CoTaskMemAlloc((lstrlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcpyW(Names[count], szValue); + lstrcpyW(Names[count], szValue); } } wsprintfW(szGuidKey,szToGuidFmt,szNextKey);