Module: wine Branch: master Commit: 445af46a1838b724d12c012f0be4bc62445e6864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=445af46a1838b724d12c012f0...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jun 18 09:06:45 2019 +0200
propsys: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/propsys/Makefile.in | 2 ++ dlls/propsys/propstore.c | 2 -- dlls/propsys/propsys_main.c | 10 ++++------ dlls/propsys/propvar.c | 9 +++------ 4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index a445922..ec0b223 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -2,6 +2,8 @@ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ propstore.c \ propsys_main.c \ diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 9c848fc..6212f29 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -19,7 +19,6 @@ */
#define COBJMACROS -#include "config.h"
#include <stdarg.h>
@@ -29,7 +28,6 @@ #include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h"
#include "initguid.h" diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 65d157d..7ae3870 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -20,7 +20,6 @@ */
#define COBJMACROS -#include "config.h"
#include <stdarg.h>
@@ -30,7 +29,6 @@ #include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h"
#include "propsys_private.h"
@@ -307,7 +305,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch return E_NOT_SUFFICIENT_BUFFER; }
- sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, + swprintf(psz, cch, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); @@ -317,11 +315,11 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = ' '; cch -= GUIDSTRING_MAX - 1 + 1;
- len = sprintfW(pidW, pid_fmtW, pkey->pid); + len = swprintf(pidW, ARRAY_SIZE(pidW), pid_fmtW, pkey->pid);
if (cch >= len + 1) { - strcpyW(p, pidW); + lstrcpyW(p, pidW); return S_OK; } else @@ -497,7 +495,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) }
/* Overflow is not checked. */ - while (isdigitW(*pszString)) + while (iswdigit(*pszString)) { pkey->pid *= 10; pkey->pid += (*pszString - '0'); diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 98fb129..dcfee2b 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h"
#include <stdarg.h> #include <stdio.h> @@ -37,7 +35,6 @@ #include "strsafe.h"
#include "wine/debug.h" -#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(propsys);
@@ -124,7 +121,7 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, case VT_BSTR: { WCHAR *end; - *res = strtolW(pv->u.pwszVal, &end, 0); + *res = wcstol(pv->u.pwszVal, &end, 0); if (pv->u.pwszVal == end) return DISP_E_TYPEMISMATCH; src_signed = *res < 0; @@ -587,7 +584,7 @@ static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) '-','%','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};
- sprintfW(str, format, guid->Data1, guid->Data2, guid->Data3, + swprintf(str, 39, format, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } @@ -764,7 +761,7 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) case VT_BSTR: return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); case VT_LPWSTR: - return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, lstrlenW(ppropvar->u.pwszVal), guid); case VT_CLSID: memcpy(guid, ppropvar->u.puuid, sizeof(*ppropvar->u.puuid)); return S_OK;
-
Alexandre Julliard