June 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : loadperf: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 2e6b4e1f5b765f7c1f6982e8879e091eab8de950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6b4e1f5b765f7c1f6982e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:31 2019 +0200 loadperf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/Makefile.in | 2 ++ dlls/loadperf/loadperf_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in index b7c9620..9258ec0 100644 --- a/dlls/loadperf/Makefile.in +++ b/dlls/loadperf/Makefile.in @@ -1,5 +1,7 @@ MODULE = loadperf.dll IMPORTLIB = loadperf +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ loadperf_main.c diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 8f0da11..54901a7 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : localspl: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 8c98417cfd24b1fc34ee24f1d068ed5e8c7f403f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c98417cfd24b1fc34ee24f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:52 2019 +0200 localspl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/Makefile.in | 2 ++ dlls/localspl/localmon.c | 16 ++++++++-------- dlls/localspl/provider.c | 29 ++++++++++++++--------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index f0de382..abff68a 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -1,6 +1,8 @@ MODULE = localspl.dll IMPORTS = spoolss user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ localmon.c \ localspl_main.c \ diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index f540367..6937e05 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define COBJMACROS @@ -35,7 +36,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); @@ -279,13 +279,13 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpW(name, portname_LPT, ARRAY_SIZE(portname_LPT) - 1)) + if (!wcsncmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) - 1)) return PORT_IS_LPT; - if (!strncmpW(name, portname_COM, ARRAY_SIZE(portname_COM) - 1)) + if (!wcsncmp(name, portname_COM, ARRAY_SIZE(portname_COM) - 1)) return PORT_IS_COM; - if (!strcmpW(name, portname_FILE)) + if (!lstrcmpW(name, portname_FILE)) return PORT_IS_FILE; if (name[0] == '/') @@ -294,10 +294,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) - 1)) + if (!wcsncmp(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) - 1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) - 1)) + if (!wcsncmp(name, portname_LPR, ARRAY_SIZE(portname_LPR) - 1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ @@ -663,7 +663,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE needed = sizeof(buffer) - sizeof(WCHAR); res = RegQueryValueExW(hroot, TransmissionRetryTimeoutW, NULL, NULL, (LPBYTE) buffer, &needed); if ((res == ERROR_SUCCESS) && (buffer[0])) { - *((LPDWORD) pOutputData) = strtoulW(buffer, NULL, 0); + *((LPDWORD) pOutputData) = wcstoul(buffer, NULL, 0); } RegCloseKey(hroot); } @@ -696,7 +696,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE if (!lstrcmpW(pszDataName, cmd_SetDefaultCommConfigW)) { /* get the portname from the Handle */ - ptr = strchrW(((xcv_t *)hXcv)->nameW, ' '); + ptr = wcschr(((xcv_t *)hXcv)->nameW, ' '); if (ptr) { ptr++; /* skip the space */ } diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17d982..cb31b19 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" #include "localspl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); @@ -222,9 +221,9 @@ static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) else { srcname = apd->src; - strcatW( srcname, file_part ); + lstrcatW( srcname, file_part ); } - strcatW( apd->dst, file_part ); + lstrcatW( apd->dst, file_part ); TRACE("%s => %s\n", debugstr_w(srcname), debugstr_w(apd->dst)); @@ -260,7 +259,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) server = &name[2]; /* skip over both backslash, find separator '\' */ - ptr = strchrW(server, '\\'); + ptr = wcschr(server, '\\'); serverlen = (ptr) ? ptr - server : lstrlenW(server); /* servername is empty */ @@ -277,7 +276,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { - if ((serverlen == len) && (strncmpiW(server, buffer, len) == 0)) { + if ((serverlen == len) && (wcsnicmp(server, buffer, len) == 0)) { /* The requested Servername is our computername */ return 0; } @@ -296,7 +295,7 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) if (name == NULL) return NULL; if ((name[0] == '\\') && (name[1] == '\\')) { /* skip over the servername and search for the following '\' */ - name = strchrW(&name[2], '\\'); + name = wcschr(&name[2], '\\'); if ((name) && (name[1])) { /* found a separator ('\') followed by a name: skip over the separator and return the rest */ @@ -1197,7 +1196,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printername) { len = ARRAY_SIZE(XcvMonitorW) - 1; - if (strncmpW(printername, XcvMonitorW, len) == 0) { + if (wcsncmp(printername, XcvMonitorW, len) == 0) { /* OpenPrinter(",XcvMonitor ", ...) detected */ TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); printer->pm = monitor_load(&printername[len], NULL); @@ -1211,7 +1210,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) else { len = ARRAY_SIZE(XcvPortW) - 1; - if (strncmpW( printername, XcvPortW, len) == 0) { + if (wcsncmp( printername, XcvPortW, len) == 0) { /* OpenPrinter(",XcvPort ", ...) detected */ TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); printer->pm = monitor_load_by_port(&printername[len]); @@ -1272,7 +1271,7 @@ end: static inline WCHAR *get_file_part( WCHAR *name ) { - WCHAR *ptr = strrchrW( name, '\\' ); + WCHAR *ptr = wcsrchr( name, '\\' ); if (ptr) return ptr + 1; return name; } @@ -1364,22 +1363,22 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo sizeof(DWORD)); file = get_file_part( di.pDriverPath ); - RegSetValueExW( hdrv, driverW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, driverW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pDriverPath, file, &apd ); file = get_file_part( di.pDataFile ); - RegSetValueExW( hdrv, data_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, data_fileW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pDataFile, file, &apd ); file = get_file_part( di.pConfigFile ); - RegSetValueExW( hdrv, configuration_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, configuration_fileW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pConfigFile, file, &apd ); /* settings for level 3 */ if (di.pHelpFile) { file = get_file_part( di.pHelpFile ); - RegSetValueExW( hdrv, help_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, help_fileW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pHelpFile, file, &apd ); } else @@ -1390,10 +1389,10 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo WCHAR *reg, *reg_ptr, *in_ptr; reg = reg_ptr = HeapAlloc( GetProcessHeap(), 0, multi_sz_lenW( di.pDependentFiles ) ); - for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += strlenW( in_ptr ) + 1) + for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += lstrlenW( in_ptr ) + 1) { file = get_file_part( in_ptr ); - len = strlenW( file ) + 1; + len = lstrlenW( file ) + 1; memcpy( reg_ptr, file, len * sizeof(WCHAR) ); reg_ptr += len; apd_copyfile( in_ptr, file, &apd );

1 0

Alexandre Julliard : localui: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 21d95abef8184a7f99e8abdc3da8a762aca46567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d95abef8184a7f99e8abdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:56:06 2019 +0200 localui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/Makefile.in | 2 ++ dlls/localui/localui.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index eb4273f..70b7254 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -1,6 +1,8 @@ MODULE = localui.dll IMPORTS = winspool user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ localui.c diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 77c8bf0..ab8f5c9 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -30,7 +30,6 @@ #include "ddk/winsplp.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "localui.h" WINE_DEFAULT_DEBUG_CHANNEL(localui); @@ -187,7 +186,7 @@ static void dlg_port_already_exists(HWND hWnd, LPCWSTR portname) message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (message) { message[0] = '\0'; - snprintfW(message, len, res_PortExistsW, portname); + swprintf(message, len, res_PortExistsW, portname); MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); HeapFree(GetProcessHeap(), 0, message); } @@ -213,7 +212,7 @@ static void dlg_invalid_portname(HWND hWnd, LPCWSTR portname) message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (message) { message[0] = '\0'; - snprintfW(message, len, res_InvalidNameW, portname); + swprintf(message, len, res_InvalidNameW, portname); MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); HeapFree(GetProcessHeap(), 0, message); } @@ -380,7 +379,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* native localui.dll use the same limits */ if ((res > 0) && (res < 1000000) && status) { - sprintfW(bufferW, fmt_uW, res); + swprintf(bufferW, ARRAY_SIZE(bufferW), fmt_uW, res); res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) bufferW, (lstrlenW(bufferW) +1) * sizeof(WCHAR), @@ -416,13 +415,13 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpiW(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) + if (!wcsnicmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) return PORT_IS_LPT; - if (!strncmpiW(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) + if (!wcsnicmp(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) return PORT_IS_COM; - if (!strcmpiW(name, portname_FILE)) + if (!wcsicmp(name, portname_FILE)) return PORT_IS_FILE; if (name[0] == '/') @@ -431,10 +430,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) + if (!wcsncmp(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) + if (!wcsncmp(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */

1 0

Alexandre Julliard : lzexpand: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: e62ef2709f01924cb61d6a2c52f422875704490f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62ef2709f01924cb61d6a2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:56:16 2019 +0200 lzexpand: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/lzexpand.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/lzexpand.dll16/Makefile.in b/dlls/lzexpand.dll16/Makefile.in index b44a1eb..0269e46 100644 --- a/dlls/lzexpand.dll16/Makefile.in +++ b/dlls/lzexpand.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = lzexpand.dll16 IMPORTS = lz32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,lz32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,lz32.dll C_SRCS = lzexpand.c

1 0

Alexandre Julliard : mapi32: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 70f552c617cf3517c5c2513484e21e6815d8f13a URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f552c617cf3517c5c25134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:57:34 2019 +0200 mapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/Makefile.in | 2 ++ dlls/mapi32/prop.c | 19 +++++++++---------- dlls/mapi32/sendmail.c | 2 -- dlls/mapi32/util.c | 9 ++++----- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 3811fd1..305522c 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -2,6 +2,8 @@ MODULE = mapi32.dll IMPORTLIB = mapi32 IMPORTS = uuid shlwapi shell32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ imalloc.c \ mapi32_main.c \ diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 0700e5c..55baf91 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -29,7 +29,6 @@ #include "shlwapi.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mapival.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -91,7 +90,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, memcpy(lpDest->Value.lpszA, lpSrc->Value.lpszA, ulLen); break; case PT_UNICODE: - ulLen = (strlenW(lpSrc->Value.lpszW) + 1u) * sizeof(WCHAR); + ulLen = (lstrlenW(lpSrc->Value.lpszW) + 1u) * sizeof(WCHAR); scode = lpMore(ulLen, lpOrig, (LPVOID*)&lpDest->Value.lpszW); if (SUCCEEDED(scode)) memcpy(lpDest->Value.lpszW, lpSrc->Value.lpszW, ulLen); @@ -156,7 +155,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, for (i = 0; i < lpSrc->Value.MVszW.cValues; i++) { - ULONG ulStrLen = strlenW(lpSrc->Value.MVszW.lppszW[i]) + 1u; + ULONG ulStrLen = lstrlenW(lpSrc->Value.MVszW.lppszW[i]) + 1u; lpDest->Value.MVszW.lppszW[i] = lpNextStr; memcpy(lpNextStr, lpSrc->Value.MVszW.lppszW[i], ulStrLen * sizeof(WCHAR)); @@ -263,7 +262,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) break; case PT_MV_UNICODE: ulRet = 0u; for (i = 0; i < lpProp->Value.MVszW.cValues; i++) - ulRet += (strlenW(lpProp->Value.MVszW.lppszW[i]) + 1u); + ulRet += (lstrlenW(lpProp->Value.MVszW.lppszW[i]) + 1u); ulRet *= sizeof(WCHAR); break; case PT_UNICODE: ulRet = (lstrlenW(lpProp->Value.lpszW) + 1u) * sizeof(WCHAR); @@ -504,7 +503,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) case PT_STRING8: return lstrcmpA(lpPropLeft->Value.lpszA, lpPropRight->Value.lpszA); case PT_UNICODE: - return strcmpW(lpPropLeft->Value.lpszW, lpPropRight->Value.lpszW); + return lstrcmpW(lpPropLeft->Value.lpszW, lpPropRight->Value.lpszW); case PT_ERROR: if (lpPropLeft->Value.err > lpPropRight->Value.err) return 1; @@ -828,7 +827,7 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG lpDataDest += ulLen; break; case PT_UNICODE: - ulLen = (strlenW(lpProps->Value.lpszW) + 1u) * sizeof(WCHAR); + ulLen = (lstrlenW(lpProps->Value.lpszW) + 1u) * sizeof(WCHAR); lpDest->Value.lpszW = (LPWSTR)lpDataDest; memcpy(lpDest->Value.lpszW, lpProps->Value.lpszW, ulLen); lpDataDest += ulLen; @@ -867,7 +866,7 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG for (i = 0; i < lpProps->Value.MVszW.cValues; i++) { - ULONG ulStrLen = (strlenW(lpProps->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); + ULONG ulStrLen = (lstrlenW(lpProps->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); lpDest->Value.MVszW.lppszW[i] = (LPWSTR)lpDataDest; memcpy(lpDataDest, lpProps->Value.MVszW.lppszW[i], ulStrLen); @@ -981,7 +980,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, ulLen = bBadPtr ? 0 : (lstrlenW(lpDest->Value.lpszW) + 1u) * sizeof(WCHAR); lpDest->Value.lpszW = (LPWSTR)RELOC_PTR(lpDest->Value.lpszW); if (bBadPtr) - ulLen = (strlenW(lpDest->Value.lpszW) + 1u) * sizeof(WCHAR); + ulLen = (lstrlenW(lpDest->Value.lpszW) + 1u) * sizeof(WCHAR); ulCount += ulLen; break; case PT_BINARY: @@ -1020,11 +1019,11 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, for (i = 0; i < lpDest->Value.MVszW.cValues; i++) { - ULONG ulStrLen = bBadPtr ? 0 : (strlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); + ULONG ulStrLen = bBadPtr ? 0 : (lstrlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); lpDest->Value.MVszW.lppszW[i] = (LPWSTR)RELOC_PTR(lpDest->Value.MVszW.lppszW[i]); if (bBadPtr) - ulStrLen = (strlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); + ulStrLen = (lstrlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); ulCount += ulStrLen; } break; diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 407dd13..e1b7a68 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 9c3b019..7e324a0 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mapival.h" #include "xcmc.h" #include "msi.h" @@ -404,7 +403,7 @@ VOID WINAPI SwapPword(PUSHORT lpData, ULONG ulLen) ULONG WINAPI MNLS_lstrlenW(LPCWSTR lpszStr) { TRACE("(%s)\n", debugstr_w(lpszStr)); - return strlenW(lpszStr); + return lstrlenW(lpszStr); } /************************************************************************* @@ -423,7 +422,7 @@ ULONG WINAPI MNLS_lstrlenW(LPCWSTR lpszStr) INT WINAPI MNLS_lstrcmpW(LPCWSTR lpszLeft, LPCWSTR lpszRight) { TRACE("(%s,%s)\n", debugstr_w(lpszLeft), debugstr_w(lpszRight)); - return strcmpW(lpszLeft, lpszRight); + return lstrcmpW(lpszLeft, lpszRight); } /************************************************************************* @@ -443,7 +442,7 @@ ULONG WINAPI MNLS_lstrcpyW(LPWSTR lpszDest, LPCWSTR lpszSrc) ULONG len; TRACE("(%p,%s)\n", lpszDest, debugstr_w(lpszSrc)); - len = (strlenW(lpszSrc) + 1) * sizeof(WCHAR); + len = (lstrlenW(lpszSrc) + 1) * sizeof(WCHAR); memcpy(lpszDest, lpszSrc, len); return len; } @@ -494,7 +493,7 @@ BOOL WINAPI FEqualNames(LPMAPINAMEID lpName1, LPMAPINAMEID lpName2) return FALSE; if (lpName1->ulKind == MNID_STRING) - return !strcmpW(lpName1->Kind.lpwstrName, lpName2->Kind.lpwstrName); + return !lstrcmpW(lpName1->Kind.lpwstrName, lpName2->Kind.lpwstrName); return lpName1->Kind.lID == lpName2->Kind.lID; }

1 0

Alexandre Julliard : mapistub: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 1b9706ef9b7254837d53b7e93c85d115fb186c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9706ef9b7254837d53b7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:57:44 2019 +0200 mapistub: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapistub/Makefile.in | 2 ++ dlls/mapistub/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mapistub/Makefile.in b/dlls/mapistub/Makefile.in index 93671ae..63e06a4 100644 --- a/dlls/mapistub/Makefile.in +++ b/dlls/mapistub/Makefile.in @@ -1,4 +1,6 @@ MODULE = mapistub.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mapistub/main.c b/dlls/mapistub/main.c index 51ff43b..d1d8117 100644 --- a/dlls/mapistub/main.c +++ b/dlls/mapistub/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : mciavi32: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 3e95920286526579272bdb193479751180e8ffab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e95920286526579272bdb19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:05 2019 +0200 mciavi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/Makefile.in | 2 ++ dlls/mciavi32/info.c | 1 - dlls/mciavi32/mciavi.c | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index e7fe6ba..f880b09 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -1,6 +1,8 @@ MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ info.c \ mciavi.c \ diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 3d138b1..d516c4d 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -21,7 +21,6 @@ #include <string.h> #include "private_mciavi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciavi); diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 9aa6cd8..d8df240 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -40,7 +40,6 @@ #include <string.h> #include "private_mciavi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciavi); @@ -253,13 +252,13 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, /* FIXME : what should be done id wma->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpOpenParms->lpstrElementName)); - wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); - strcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); + wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); + lstrcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); if (lpOpenParms->lpstrElementName[0] == '@') { /* The file name @11223344 encodes an AVIFile handle in decimal notation * in Win3.1 and w2k/NT, but this feature is absent in win95 (KB140750). - * wma->hFile = LongToHandle(strtolW(lpOpenParms->lpstrElementName+1, NULL, 10)); */ + * wma->hFile = LongToHandle(wcstol(lpOpenParms->lpstrElementName+1, NULL, 10)); */ FIXME("Using AVIFile/Stream %s NIY\n", debugstr_w(lpOpenParms->lpstrElementName)); } wma->hFile = mmioOpenW(lpOpenParms->lpstrElementName, NULL,

1 0

Alexandre Julliard : mcicda: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 5007d260275055cc4592d7a7e6d92381fc8a966c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007d260275055cc4592d7a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:17 2019 +0200 mcicda: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/Makefile.in | 2 ++ dlls/mcicda/mcicda.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in index fad0689..9bfee00 100644 --- a/dlls/mcicda/Makefile.in +++ b/dlls/mcicda/Makefile.in @@ -1,5 +1,7 @@ MODULE = mcicda.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mcicda.c diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 18881ef..e23ba5a 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -36,7 +35,6 @@ #include "ntddcdrm.h" #include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dsound.h" WINE_DEFAULT_DEBUG_CHANNEL(mcicda); @@ -683,7 +681,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) } res = CDROM_Audio_GetSerial(&toc); - sprintfW(buffer, wszLu, res); + swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res); str = buffer; } else { WARN("Don't know this info command (%u)\n", dwFlags);

1 0

Alexandre Julliard : mciqtz32: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 106f2feafadc88fe74c3419dbf44398d9d842866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=106f2feafadc88fe74c3419d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:32 2019 +0200 mciqtz32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index 4aa7e11..c38bbc4 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -1,6 +1,8 @@ MODULE = mciqtz32.dll IMPORTS = strmiids oleaut32 ole32 winmm user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mciqtz.c

1 0

Alexandre Julliard : mciseq: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 8ce096a9f0b76aae9810e2faa2d1a60988f2bceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce096a9f0b76aae9810e2fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:47 2019 +0200 mciseq: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciseq/Makefile.in | 2 ++ dlls/mciseq/mcimidi.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in index 161a3de..79e5163 100644 --- a/dlls/mciseq/Makefile.in +++ b/dlls/mciseq/Makefile.in @@ -1,5 +1,7 @@ MODULE = mciseq.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mcimidi.c diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 864ab98..c6bc860 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -32,12 +32,12 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wingdi.h" #include "winuser.h" #include "wownt32.h" #include "mmddk.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mcimidi); @@ -692,8 +692,8 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp return MCIERR_FILE_NOT_FOUND; } wmm->lpstrElementName = HeapAlloc(GetProcessHeap(), 0, - (strlenW(lpParms->lpstrElementName) + 1) * sizeof(WCHAR)); - strcpyW(wmm->lpstrElementName, lpParms->lpstrElementName); + (lstrlenW(lpParms->lpstrElementName) + 1) * sizeof(WCHAR)); + lstrcpyW(wmm->lpstrElementName, lpParms->lpstrElementName); } } TRACE("hFile=%p\n", wmm->hFile);

1 0