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

Alexandre Julliard : samlib: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: b2d896649217b4903ee05132bce14b3724c100f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d896649217b4903ee05132… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:06:16 2019 +0200 samlib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/samlib/Makefile.in | 2 ++ dlls/samlib/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/samlib/Makefile.in b/dlls/samlib/Makefile.in index 88266fd..1ca2a4a 100644 --- a/dlls/samlib/Makefile.in +++ b/dlls/samlib/Makefile.in @@ -1,4 +1,6 @@ MODULE = samlib.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/samlib/main.c b/dlls/samlib/main.c index e78e7a2..a1af3c9 100644 --- a/dlls/samlib/main.c +++ b/dlls/samlib/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 : sapi: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 5dedd2c641c13169b330db4d72adb62a84b74701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dedd2c641c13169b330db4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:06:34 2019 +0200 sapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 2 ++ dlls/sapi/main.c | 1 - dlls/sapi/sapi_private.h | 3 +-- dlls/sapi/token.c | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index b8b4beb..94e21bd 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = sapi.dll IMPORTS = uuid ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ token.c diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index 5ad6b63..f86fee2 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index b069222..1f89672 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -19,7 +19,6 @@ */ #include "wine/heap.h" -#include "wine/unicode.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; @@ -32,7 +31,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if (str) { - size = (strlenW( str ) + 1) * sizeof(WCHAR); + size = (lstrlenW( str ) + 1) * sizeof(WCHAR); ret = heap_alloc( size ); if (ret) memcpy( ret, str, size ); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index eb35928..d2b70c9 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS @@ -387,7 +386,7 @@ static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key { NULL } }; struct table *ptr; - int len = strlenW( str ); + int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) {

1 0

Alexandre Julliard : sas: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 49eac4d7009becbba7e461501d6f7d2cbf649ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=49eac4d7009becbba7e46150… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:06:42 2019 +0200 sas: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sas/Makefile.in | 2 ++ dlls/sas/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/sas/Makefile.in b/dlls/sas/Makefile.in index aa76b59..9a3a8de 100644 --- a/dlls/sas/Makefile.in +++ b/dlls/sas/Makefile.in @@ -1,4 +1,6 @@ MODULE = sas.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/sas/main.c b/dlls/sas/main.c index 1a2017d..a7e9b8b 100644 --- a/dlls/sas/main.c +++ b/dlls/sas/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 : scarddlg: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 7cd70beeebeb5c6423b599b196ed4d8aa9b83722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd70beeebeb5c6423b599b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:06:51 2019 +0200 scarddlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scarddlg/Makefile.in | 2 ++ dlls/scarddlg/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scarddlg/Makefile.in b/dlls/scarddlg/Makefile.in index 39418bc..5b69e5d 100644 --- a/dlls/scarddlg/Makefile.in +++ b/dlls/scarddlg/Makefile.in @@ -1,4 +1,6 @@ MODULE = scarddlg.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/scarddlg/main.c b/dlls/scarddlg/main.c index 59cc5a8..c39782e 100644 --- a/dlls/scarddlg/main.c +++ b/dlls/scarddlg/main.c @@ -25,7 +25,6 @@ #include "winuser.h" #include "wfext.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(scarddlg);

1 0

Alexandre Julliard : sccbase: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: f8c55bf8d0b9d58ee1e1ba10d10d5057baa82156 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8c55bf8d0b9d58ee1e1ba10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:07:03 2019 +0200 sccbase: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sccbase/Makefile.in | 2 ++ dlls/sccbase/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sccbase/Makefile.in b/dlls/sccbase/Makefile.in index 4a2d063..744d5f8 100644 --- a/dlls/sccbase/Makefile.in +++ b/dlls/sccbase/Makefile.in @@ -1,4 +1,6 @@ MODULE = sccbase.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/sccbase/main.c b/dlls/sccbase/main.c index 1fb221f..b263d4d 100644 --- a/dlls/sccbase/main.c +++ b/dlls/sccbase/main.c @@ -16,8 +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 : schannel: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 6dde50b1b604e9e12e55cd75d26966fc9cc088eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dde50b1b604e9e12e55cd75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:07:33 2019 +0200 schannel: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index ef213f2..492683a 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -1,6 +1,8 @@ MODULE = schannel.dll IMPORTS = secur32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ lsamode.c \ schannel_main.c \

1 0

Alexandre Julliard : schedsvc: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 88680e522b8d04217e5829d63e0218413c8dab70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88680e522b8d04217e5829d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:07:53 2019 +0200 schedsvc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/Makefile.in | 2 ++ dlls/schedsvc/atsvc.c | 6 +++--- dlls/schedsvc/schedsvc.c | 34 +++++++++++++++++----------------- dlls/schedsvc/schedsvc_private.h | 3 +-- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 021cae4..1737650 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,6 +1,8 @@ MODULE = schedsvc.dll IMPORTS = rpcrt4 advapi32 ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ atsvc.c \ schedsvc.c \ diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index a0e0727..5a34b33 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -1096,9 +1096,9 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) static const WCHAR fmtW[] = { '\\','T','a','s','k','s','\\','A','t','%','u','.','j','o','b',0 }; WCHAR task_name[MAX_PATH], name[32]; - strcpyW(task_name, windir); - sprintfW(name, fmtW, current_jobid); - strcatW(task_name, name); + lstrcpyW(task_name, windir); + swprintf(name, ARRAY_SIZE(name), fmtW, current_jobid); + lstrcatW(task_name, name); if (create_job(task_name, info)) { struct job_t *job; diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index c34b485..6236708 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -46,17 +46,17 @@ static WCHAR *get_full_name(const WCHAR *path, WCHAR **relative_path) int len; len = GetSystemDirectoryW(NULL, 0); - len += strlenW(tasksW) + strlenW(path); + len += lstrlenW(tasksW) + lstrlenW(path); target = heap_alloc(len * sizeof(WCHAR)); if (target) { GetSystemDirectoryW(target, len); - strcatW(target, tasksW); + lstrcatW(target, tasksW); if (relative_path) - *relative_path = target + strlenW(target) - 1; + *relative_path = target + lstrlenW(target) - 1; while (*path == '\\') path++; - strcatW(target, path); + lstrcatW(target, path); } return target; } @@ -70,12 +70,12 @@ static HRESULT create_directory(const WCHAR *path) WCHAR *new_path; int len; - new_path = heap_alloc((strlenW(path) + 1) * sizeof(WCHAR)); + new_path = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)); if (!new_path) return E_OUTOFMEMORY; - strcpyW(new_path, path); + lstrcpyW(new_path, path); - len = strlenW(new_path); + len = lstrlenW(new_path); while (len && new_path[len - 1] == '\\') { new_path[len - 1] = 0; @@ -87,7 +87,7 @@ static HRESULT create_directory(const WCHAR *path) WCHAR *slash; DWORD last_error = GetLastError(); - if (last_error != ERROR_PATH_NOT_FOUND || !(slash = strrchrW(new_path, '\\'))) + if (last_error != ERROR_PATH_NOT_FOUND || !(slash = wcsrchr(new_path, '\\'))) { hr = HRESULT_FROM_WIN32(last_error); break; @@ -184,10 +184,10 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl full_name = get_full_name(path, &relative_path); if (!full_name) return E_OUTOFMEMORY; - if (strchrW(path, '\\') || strchrW(path, '/')) + if (wcschr(path, '\\') || wcschr(path, '/')) { - WCHAR *p = strrchrW(full_name, '/'); - if (!p) p = strrchrW(full_name, '\\'); + WCHAR *p = wcsrchr(full_name, '/'); + if (!p) p = wcsrchr(full_name, '\\'); *p = 0; hr = create_directory(full_name); if (hr != S_OK && hr != HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) @@ -410,14 +410,14 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i full_name = get_full_name(path, NULL); if (!full_name) return E_OUTOFMEMORY; - if (strlenW(full_name) + 2 > MAX_PATH) + if (lstrlenW(full_name) + 2 > MAX_PATH) { heap_free(full_name); return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); } - strcpyW(pathW, full_name); - strcatW(pathW, allW); + lstrcpyW(pathW, full_name); + lstrcatW(pathW, allW); heap_free(full_name); @@ -518,14 +518,14 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind full_name = get_full_name(path, NULL); if (!full_name) return E_OUTOFMEMORY; - if (strlenW(full_name) + 2 > MAX_PATH) + if (lstrlenW(full_name) + 2 > MAX_PATH) { heap_free(full_name); return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); } - strcpyW(pathW, full_name); - strcatW(pathW, allW); + lstrcpyW(pathW, full_name); + lstrcatW(pathW, allW); heap_free(full_name); diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 117c6f5..1eada2b 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -20,7 +20,6 @@ #define __WINE_SCHEDSVC_PRIVATE_H__ #include "wine/heap.h" -#include "wine/unicode.h" void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; @@ -38,7 +37,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *src) WCHAR *dst; unsigned len; if (!src) return NULL; - len = (strlenW(src) + 1) * sizeof(WCHAR); + len = (lstrlenW(src) + 1) * sizeof(WCHAR); if ((dst = heap_alloc(len))) memcpy(dst, src, len); return dst; }

1 0

Alexandre Julliard : scrobj: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 43b7995a0d5ed988ee4bae0701c9cd3a5d3feb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43b7995a0d5ed988ee4bae07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:08:03 2019 +0200 scrobj: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 2 ++ dlls/scrobj/scrobj.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index 179409a..b175b54 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,6 +1,8 @@ MODULE = scrobj.dll IMPORTS = uuid ole32 oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ scrobj.c diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 989a648..69d0e75 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : scrrun: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 107f54eff71ceab398fc4f484952efd3232d94c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107f54eff71ceab398fc4f48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:09:09 2019 +0200 scrrun: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/Makefile.in | 2 ++ dlls/scrrun/dictionary.c | 9 ++---- dlls/scrrun/filesystem.c | 72 +++++++++++++++++++++++------------------------- dlls/scrrun/scrrun.c | 1 - 4 files changed, 40 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=107f54eff71ceab398fc…

1 0

Alexandre Julliard : scsiport: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: a3e9e5aa62d5b85060debfc62fdced6456afbf3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e9e5aa62d5b85060debfc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:09:16 2019 +0200 scsiport: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scsiport.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in index ed9113a..e8653dd 100644 --- a/dlls/scsiport.sys/Makefile.in +++ b/dlls/scsiport.sys/Makefile.in @@ -2,5 +2,7 @@ MODULE = scsiport.sys IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ scsiport.c

1 0