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

Alexandre Julliard : wmasf: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: 7efeed692de8a49e76a214688e5b09c8c2edb2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7efeed692de8a49e76a21468… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:08:22 2019 +0200 wmasf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmasf/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmasf/Makefile.in b/dlls/wmasf/Makefile.in index 6fec158..1da9f78 100644 --- a/dlls/wmasf/Makefile.in +++ b/dlls/wmasf/Makefile.in @@ -1,4 +1,6 @@ MODULE = wmasf.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : wintab: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: cc00ffa397b63de6d3f440481f3a2e5d8e61c418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc00ffa397b63de6d3f44048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:07:30 2019 +0200 wintab: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab.dll16/Makefile.in | 2 +- dlls/wintab.dll16/wintab.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in index 0547920..8d0cd7c 100644 --- a/dlls/wintab.dll16/Makefile.in +++ b/dlls/wintab.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = wintab.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,wintab32.dll C_SRCS = wintab.c diff --git a/dlls/wintab.dll16/wintab.c b/dlls/wintab.dll16/wintab.c index fc35977..cd8bcf6 100644 --- a/dlls/wintab.dll16/wintab.c +++ b/dlls/wintab.dll16/wintab.c @@ -18,8 +18,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 : wintrust: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: 8a281038afd24fcfef3b95c1543e1d73c3876e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a281038afd24fcfef3b95c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:08:07 2019 +0200 wintrust: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/Makefile.in | 2 ++ dlls/wintrust/asn.c | 3 --- dlls/wintrust/crypt.c | 51 +++++++++++++++++++++---------------------- dlls/wintrust/wintrust_main.c | 2 -- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 244f17f..c486083 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = wintrust IMPORTS = crypt32 user32 advapi32 DELAYIMPORTS = cryptui imagehlp +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ asn.c \ crypt.c \ diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 46525f0..72536e8 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include <assert.h> diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 1a36965..b454c8b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -33,7 +33,6 @@ #include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -75,7 +74,7 @@ static HCATINFO create_catinfo(const WCHAR *filename) SetLastError(ERROR_OUTOFMEMORY); return INVALID_HANDLE_VALUE; } - strcpyW(ci->file, filename); + lstrcpyW(ci->file, filename); ci->magic = CATINFO_MAGIC; return ci; } @@ -125,13 +124,13 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, } GetSystemDirectoryW(catroot_dir, MAX_PATH); - strcatW(catroot_dir, catroot); + lstrcatW(catroot_dir, catroot); /* create the directory if it doesn't exist */ CreateDirectoryW(catroot_dir, NULL); if (!sys) sys = &defsys; - sprintfW(ca->path, fmt, catroot_dir, sys->Data1, sys->Data2, + swprintf(ca->path, ARRAY_SIZE(ca->path), fmt, catroot_dir, sys->Data1, sys->Data2, sys->Data3, sys->Data4[0], sys->Data4[1], sys->Data4[2], sys->Data4[3], sys->Data4[4], sys->Data4[5], sys->Data4[6], sys->Data4[7]); @@ -184,15 +183,15 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, return NULL; } - len = strlenW(ca->path) + strlenW(selectBaseName) + 2; + len = lstrlenW(ca->path) + lstrlenW(selectBaseName) + 2; if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; } - strcpyW(target, ca->path); - strcatW(target, slashW); - strcatW(target, selectBaseName); + lstrcpyW(target, ca->path); + lstrcatW(target, slashW); + lstrcatW(target, selectBaseName); if (!CopyFileW(catalogFile, target, FALSE)) { @@ -208,7 +207,7 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, return NULL; } ci->magic = CATINFO_MAGIC; - strcpyW(ci->file, target); + lstrcpyW(ci->file, target); HeapFree(GetProcessHeap(), 0, target); return ci; @@ -308,15 +307,15 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa { WCHAR *path; - size = strlenW(ca->path) * sizeof(WCHAR) + sizeof(globW); + size = lstrlenW(ca->path) * sizeof(WCHAR) + sizeof(globW); if (!(path = HeapAlloc(GetProcessHeap(), 0, size))) { CryptReleaseContext(prov, 0); SetLastError(ERROR_OUTOFMEMORY); return NULL; } - strcpyW(path, ca->path); - strcatW(path, globW); + lstrcpyW(path, ca->path); + lstrcatW(path, globW); FindClose(ca->find); ca->find = FindFirstFileW(path, &data); @@ -342,15 +341,15 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa struct catinfo *ci; HANDLE hcat; - size = (strlenW(ca->path) + strlenW(data.cFileName) + 2) * sizeof(WCHAR); + size = (lstrlenW(ca->path) + lstrlenW(data.cFileName) + 2) * sizeof(WCHAR); if (!(filename = HeapAlloc(GetProcessHeap(), 0, size))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; } - strcpyW(filename, ca->path); - strcatW(filename, slashW); - strcatW(filename, data.cFileName); + lstrcpyW(filename, ca->path); + lstrcatW(filename, slashW); + lstrcatW(filename, data.cFileName); hcat = CryptCATOpen(filename, CRYPTCAT_OPEN_EXISTING, prov, 0, 0); if (hcat == INVALID_HANDLE_VALUE) @@ -487,22 +486,22 @@ BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN hCatAdmin, LPCWSTR pwszCatalogF /* Only delete when there is a filename and no path */ if (pwszCatalogFile && pwszCatalogFile[0] != 0 && - !strchrW(pwszCatalogFile, '\\') && !strchrW(pwszCatalogFile, '/') && - !strchrW(pwszCatalogFile, ':')) + !wcschr(pwszCatalogFile, '\\') && !wcschr(pwszCatalogFile, '/') && + !wcschr(pwszCatalogFile, ':')) { static const WCHAR slashW[] = {'\\',0}; WCHAR *target; DWORD len; - len = strlenW(ca->path) + strlenW(pwszCatalogFile) + 2; + len = lstrlenW(ca->path) + lstrlenW(pwszCatalogFile) + 2; if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - strcpyW(target, ca->path); - strcatW(target, slashW); - strcatW(target, pwszCatalogFile); + lstrcpyW(target, ca->path); + lstrcatW(target, slashW); + lstrcatW(target, pwszCatalogFile); DeleteFileW(target); @@ -528,9 +527,9 @@ BOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN hcatadmin, WCHAR *catalog_ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - strcpyW(info->wszCatalogFile, ca->path); - strcatW(info->wszCatalogFile, slashW); - strcatW(info->wszCatalogFile, catalog_file); + lstrcpyW(info->wszCatalogFile, ca->path); + lstrcatW(info->wszCatalogFile, slashW); + lstrcatW(info->wszCatalogFile, catalog_file); return TRUE; } @@ -845,7 +844,7 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - strcpyW(info->wszCatalogFile, ci->file); + lstrcpyW(info->wszCatalogFile, ci->file); return TRUE; } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 7db0b47..a0b8a13 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define NONAMELESSUNION

1 0

Alexandre Julliard : wlanapi: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: 57c7a7fa3fba6ea667b6f7a24ed78aa44ac0e9fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c7a7fa3fba6ea667b6f7a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:08:16 2019 +0200 wlanapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/Makefile.in | 2 ++ dlls/wlanapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in index 1f4b294..5cc2287 100644 --- a/dlls/wlanapi/Makefile.in +++ b/dlls/wlanapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = wlanapi.dll IMPORTLIB = wlanapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index f0a0091..5ec0e0b 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -26,8 +26,6 @@ * that the program calls WlanGetAvailableNetworkList or WlanGetNetworkBssList. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wintab32: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: 57d5db5d6496bde039e65f93fdb253146e1d15b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d5db5d6496bde039e65f93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:07:44 2019 +0200 wintab32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/Makefile.in | 2 ++ dlls/wintab32/context.c | 1 - dlls/wintab32/manager.c | 2 -- dlls/wintab32/wintab32.c | 5 ++--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 050c78b..5e25e07 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -2,6 +2,8 @@ MODULE = wintab32.dll IMPORTLIB = wintab32 IMPORTS = user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ context.c \ manager.c \ diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 9882a3c..0514dd7 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index 200fd3c..d8d6955 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index fe535fa..98ce2bc 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -29,7 +29,6 @@ #define NOFIX32 #include "wintab.h" #include "wintab_internal.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintab32); @@ -94,8 +93,8 @@ static HMODULE load_graphics_driver(void) if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0; + lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path );

1 0

Alexandre Julliard : winsock: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: f575e5ec3638a0de8aa008f8c0d4e917656bdab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f575e5ec3638a0de8aa008f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:07:14 2019 +0200 winsock: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsock.dll16/Makefile.in | 2 +- dlls/winsock.dll16/socket.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winsock.dll16/Makefile.in b/dlls/winsock.dll16/Makefile.in index 2491a8c..633b470 100644 --- a/dlls/winsock.dll16/Makefile.in +++ b/dlls/winsock.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = winsock.dll16 IMPORTS = ws2_32 DELAYIMPORTS = user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ws2_32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ws2_32.dll C_SRCS = socket.c diff --git a/dlls/winsock.dll16/socket.c b/dlls/winsock.dll16/socket.c index ac325cd..6d0e22d 100644 --- a/dlls/winsock.dll16/socket.c +++ b/dlls/winsock.dll16/socket.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include "winsock2.h" #include "wine/winbase16.h" #include "winsock16.h"

1 0

Alexandre Julliard : winsta: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: 2a24e9af86e41e913a8fe99b985d484419d161b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a24e9af86e41e913a8fe99b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:07:21 2019 +0200 winsta: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in index dea3fa3..58f9ca1 100644 --- a/dlls/winsta/Makefile.in +++ b/dlls/winsta/Makefile.in @@ -1,4 +1,6 @@ MODULE = winsta.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : winscard: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: 722139b05d058b29770f571821da2d1903fd4fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=722139b05d058b29770f5718… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:07:03 2019 +0200 winscard: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/Makefile.in | 2 ++ dlls/winscard/winscard.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in index 8944969..aaf9743 100644 --- a/dlls/winscard/Makefile.in +++ b/dlls/winscard/Makefile.in @@ -1,6 +1,8 @@ MODULE = winscard.dll IMPORTLIB = winscard +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ winscard.c diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 91fdfd3..d524483 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.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" #include "winbase.h"

1 0

Alexandre Julliard : winnls32: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: e46823ae5d0421b0540e2907cd92c04d85fb0183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e46823ae5d0421b0540e2907… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:06:53 2019 +0200 winnls32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winnls32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in index 02c5bc4..c94375a 100644 --- a/dlls/winnls32/Makefile.in +++ b/dlls/winnls32/Makefile.in @@ -1,5 +1,7 @@ MODULE = winnls32.dll IMPORTLIB = winnls32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ winnls.c

1 0

Alexandre Julliard : winnls: Build with msvcrt.
by Alexandre Julliard June 27, 2019

June 27, 2019

Module: wine Branch: master Commit: b839e292605cb7319748c91808e1121bf1d7724f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b839e292605cb7319748c918… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:06:46 2019 +0200 winnls: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winnls.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winnls.dll16/Makefile.in b/dlls/winnls.dll16/Makefile.in index 7326bf6..73f0ef5 100644 --- a/dlls/winnls.dll16/Makefile.in +++ b/dlls/winnls.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = winnls.dll16 IMPORTS = winnls32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,winnls32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winnls32.dll C_SRCS = winnls.c

1 0