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

Michael Stefaniuc : mscoree: Remove a redundant NULL check before heap_free().
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 5bd1b2652c844a2522131bd26feb95231f718986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd1b2652c844a2522131bd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 29 21:13:20 2019 +0200 mscoree: Remove a redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 95f6a9a..13619bd 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1707,8 +1707,7 @@ static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UIN ret = TRUE; end: - if (assembly_info) - heap_free(assembly_info); + heap_free(assembly_info); if (guid_info.hActCtx) ReleaseActCtx(guid_info.hActCtx);

1 0

Zebediah Figura : quartz: Convert media type registration to IRegistrar mechanism.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: b743cfe4fbbf34ece89c8ae019d68a24923c4b87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b743cfe4fbbf34ece89c8ae0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:09 2019 -0500 quartz: Convert media type registration to IRegistrar mechanism. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/{version.rc => quartz.rc} | 3 + dlls/quartz/quartz.rgs | 82 +++++++++ dlls/quartz/regsvr.c | 305 ---------------------------------- 4 files changed, 86 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b743cfe4fbbf34ece89c…

1 0

Zebediah Figura : quartz: Avoid importing shlwapi.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 5c06f4e4d5b1301e0257c7ccce830713d6da7972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c06f4e4d5b1301e0257c7cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:10 2019 -0500 quartz: Avoid importing shlwapi. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/filesource.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 4e5f18d..56ca40d 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index fc3e508..e53db99 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -100,8 +100,7 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU return E_POINTER; /* Get the part of the name that matters */ - extension = PathFindExtensionW(pszFileName); - if (*extension != '.') + if (!(extension = strrchrW(pszFileName, '.'))) return E_FAIL; l = RegOpenKeyExW(hkeyExtensions, extension, 0, KEY_READ, &hsub);

1 0

Zebediah Figura : evr/tests: Rewrite test_evr_filter_aggregation().
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: b92619f092abbc24693cce0bce8ca5235b9b918b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b92619f092abbc24693cce0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:11 2019 -0500 evr/tests: Rewrite test_evr_filter_aggregation(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 134 +++++++++++++++++++++++++++++++++ dlls/evr/tests/filter.c | 179 --------------------------------------------- 3 files changed, 135 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b92619f092abbc24693c…

1 0

Zebediah Figura : evr/tests: Add tests for filter interfaces.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 70526d552d52575db3932160d0fa26f387d96ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=70526d552d52575db3932160… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:12 2019 -0500 evr/tests: Add tests for filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index f90b91d..34db51c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -21,6 +21,18 @@ #define COBJMACROS #include "dshow.h" #include "wine/test.h" +#include "d3d9.h" +#include "initguid.h" +#include "dxva2api.h" + +static IBaseFilter *create_evr(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} static ULONG get_refcount(void *iface) { @@ -124,11 +136,53 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_evr(); + ULONG ref; + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + todo_wine check_interface(filter, &IID_IMediaPosition, TRUE); + todo_wine check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IDirectXVideoMemoryConfiguration, FALSE); + check_interface(filter, &IID_IMemInputPin, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + START_TEST(evr) { CoInitialize(NULL); test_aggregation(); + test_interfaces(); CoUninitialize(); }

1 0

Jactry Zeng : kernel32/tests: Avoid a crash on WinXP and Win2K.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 642919382f817e6c5c0b1b7a54aacaa7fd5ab416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=642919382f817e6c5c0b1b7a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 29 11:40:43 2019 +0800 kernel32/tests: Avoid a crash on WinXP and Win2K. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8dea3b3..188689a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVO static BOOL (WINAPI *pInitOnceBeginInitialize)(PINIT_ONCE,DWORD,BOOL*,LPVOID*); static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); +static BOOL (WINAPI *pInitializeCriticalSectionEx)(CRITICAL_SECTION*,DWORD,DWORD); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); @@ -2648,8 +2649,14 @@ static void test_crit_section(void) ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + if (!pInitializeCriticalSectionEx) + { + win_skip("InitializeCriticalSectionEx isn't available, skipping tests.\n"); + return; + } + memset(&cs, 0, sizeof(cs)); - ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); @@ -2672,6 +2679,7 @@ START_TEST(sync) pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); + pInitializeCriticalSectionEx = (void *)GetProcAddress(hdll, "InitializeCriticalSectionEx"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock"); pAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "AcquireSRWLockExclusive"); pAcquireSRWLockShared = (void *)GetProcAddress(hdll, "AcquireSRWLockShared");

1 0

Zebediah Figura : winegcc: Add support for -fno-PIC.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: d97e544387e69d31842c3302915975711b0b405a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97e544387e69d31842c3302… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 23:04:54 2019 -0500 winegcc: Add support for -fno-PIC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 46b67ce..d339139 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -208,6 +208,7 @@ struct options int wine_builtin; int unwind_tables; int strip; + int pic; const char* wine_objdir; const char* output_name; const char* image_base; @@ -684,7 +685,10 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-DWINE_UNICODE_NATIVE"); } strarray_add(comp_args, "-D_REENTRANT"); - strarray_add(comp_args, "-fPIC"); + if (opts->pic) + strarray_add(comp_args, "-fPIC"); + else + strarray_add(comp_args, "-fno-PIC"); } if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) @@ -1026,7 +1030,7 @@ static void build(struct options* opts) if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_add(spec_args, "-D_REENTRANT"); - strarray_add(spec_args, "-fPIC"); + if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); if (fake_module) { @@ -1345,6 +1349,7 @@ int main(int argc, char **argv) opts.linker_args = strarray_alloc(); opts.compiler_args = strarray_alloc(); opts.winebuild_args = strarray_alloc(); + opts.pic = 1; /* determine the processor type */ if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; @@ -1466,6 +1471,10 @@ int main(int argc, char **argv) opts.unwind_tables = 1; else if (!strcmp("-fno-asynchronous-unwind-tables", argv[i])) opts.unwind_tables = 0; + else if (!strcmp("-fPIC", argv[i]) || !strcmp("-fpic", argv[i])) + opts.pic = 1; + else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) + opts.pic = 0; break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg));

1 0

Alexandre Julliard : attrib: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 45442d270cc59e1625c4a59c2816dd5939fb3dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=45442d270cc59e1625c4a59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:42:47 2019 +0200 attrib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/Makefile.in | 3 ++- programs/attrib/attrib.c | 37 ++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in index 644bb9a..a346690 100644 --- a/programs/attrib/Makefile.in +++ b/programs/attrib/Makefile.in @@ -1,7 +1,8 @@ MODULE = attrib.exe -APPMODE = -mconsole -municode IMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = attrib.c RC_SRCS = attrib.rc diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 79a599a..73e2f60 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -20,7 +20,6 @@ #include <windows.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "attrib.h" WINE_DEFAULT_DEBUG_CHANNEL(attrib); @@ -156,8 +155,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (recurse) { /* Build spec to search for */ - strcpyW(buffer, rootdir); - strcatW(buffer, starW); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, starW); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); @@ -169,13 +168,13 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) continue; /* Build new root dir to go searching in */ - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); - strcatW(buffer, slashW); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); + lstrcatW(buffer, slashW); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -185,8 +184,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } /* Build spec to search for */ - strcpyW(buffer, rootdir); - strcatW(buffer, filespec); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, filespec); WINE_TRACE("Searching for files as '%s'\n", wine_dbgstr_w(buffer)); /* Search for files in the location with the filespec supplied */ @@ -198,7 +197,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -209,8 +208,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, fd.dwFileAttributes |= attrib_set; if (!fd.dwFileAttributes) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { @@ -233,8 +232,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) { flags[7] = 'C'; } - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); ATTRIB_wprintf(fmt, flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; @@ -260,13 +259,13 @@ int wmain(int argc, WCHAR *argv[]) int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !strcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - strcpyW(name, starW); + lstrcpyW(name, starW); while (i < argc) { WCHAR *param = argv[i++]; @@ -295,7 +294,7 @@ int wmain(int argc, WCHAR *argv[]) WINE_FIXME("Unknown option %s\n", debugstr_w(param)); } } else if (param[0]) { - strcpyW(originalname, param); + lstrcpyW(originalname, param); } } @@ -305,7 +304,7 @@ int wmain(int argc, WCHAR *argv[]) GetFullPathNameW(originalname, ARRAY_SIZE(curdir), curdir, &namepart); WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); if (namepart) { - strcpyW(name, namepart); + lstrcpyW(name, namepart); *namepart = 0; } else { name[0] = 0; @@ -313,7 +312,7 @@ int wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (strpbrkW(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse,

1 0

Alexandre Julliard : cabarc: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: c7c9b45544811cceea101cd3dd947d538deed07a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c9b45544811cceea101cd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:45:59 2019 +0200 cabarc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/Makefile.in | 3 ++- programs/cabarc/cabarc.c | 48 +++++++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/programs/cabarc/Makefile.in b/programs/cabarc/Makefile.in index 73aefc9..94e0e83 100644 --- a/programs/cabarc/Makefile.in +++ b/programs/cabarc/Makefile.in @@ -1,5 +1,6 @@ MODULE = cabarc.exe -APPMODE = -mconsole -municode IMPORTS = cabinet +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = cabarc.c diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 04f2a9f..7050d8c 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <stdlib.h> @@ -29,7 +26,6 @@ #include "fci.h" #include "fdi.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cabarc); @@ -329,17 +325,17 @@ static void create_directories( const WCHAR *name ) WCHAR *path, *p; /* create the directory/directories */ - path = cab_alloc( (strlenW(name) + 1) * sizeof(WCHAR) ); - strcpyW(path, name); + path = cab_alloc( (lstrlenW(name) + 1) * sizeof(WCHAR) ); + lstrcpyW(path, name); - p = strchrW(path, '\\'); + p = wcschr(path, '\\'); while (p != NULL) { *p = 0; if (!CreateDirectoryW( path, NULL )) WINE_TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); *p = '\\'; - p = strchrW(p+1, '\\'); + p = wcschr(p+1, '\\'); } cab_free( path ); } @@ -352,10 +348,10 @@ static BOOL match_files( const WCHAR *name ) if (!*opt_files) return TRUE; for (i = 0; opt_files[i]; i++) { - unsigned int len = strlenW( opt_files[i] ); + unsigned int len = lstrlenW( opt_files[i] ); /* FIXME: do smarter matching, and wildcards */ if (!len) continue; - if (strncmpiW( name, opt_files[i], len )) continue; + if (wcsnicmp( name, opt_files[i], len )) continue; if (opt_files[i][len - 1] == '\\' || !name[len] || name[len] == '\\') return TRUE; } return FALSE; @@ -428,15 +424,15 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION } else { - if ((file = strrchrW( nameW, '\\' ))) file++; + if ((file = wcsrchr( nameW, '\\' ))) file++; else file = nameW; } if (opt_dest_dir) { - path = cab_alloc( (strlenW(opt_dest_dir) + strlenW(file) + 1) * sizeof(WCHAR) ); - strcpyW( path, opt_dest_dir ); - strcatW( path, file ); + path = cab_alloc( (lstrlenW(opt_dest_dir) + lstrlenW(file) + 1) * sizeof(WCHAR) ); + lstrcpyW( path, opt_dest_dir ); + lstrcatW( path, file ); } else path = file; @@ -521,11 +517,11 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) WIN32_FIND_DATAW data; BOOL ret = TRUE; - if (!(buffer = cab_alloc( (strlenW(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; - strcpyW( buffer, dir ); - p = buffer + strlenW( buffer ); + if (!(buffer = cab_alloc( (lstrlenW(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; + lstrcpyW( buffer, dir ); + p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, wildcardW ); + lstrcpyW( p, wildcardW ); if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) { @@ -535,7 +531,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) if (data.cFileName[0] == '.' && data.cFileName[1] == '.' && !data.cFileName[2]) continue; if (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) continue; - strcpyW( p, data.cFileName ); + lstrcpyW( p, data.cFileName ); if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ret = add_directory( fci, buffer ); else @@ -595,7 +591,7 @@ static int new_cabinet( char *cab_dir ) for (file = opt_files; *file; file++) { - if (!strcmpW( *file, plusW )) + if (!lstrcmpW( *file, plusW )) FCIFlushFolder( fci, fci_get_next_cab, fci_status ); else if (!(ret = add_file_or_directory( fci, *file ))) break; @@ -646,7 +642,7 @@ int wmain( int argc, WCHAR *argv[] ) { case 'd': argv++; argc--; - opt_cabinet_size = atoiW( argv[1] ); + opt_cabinet_size = wcstol( argv[1], NULL, 10 ); if (opt_cabinet_size < 50000) { WINE_MESSAGE( "cabarc: Cabinet size must be at least 50000\n" ); @@ -658,12 +654,12 @@ int wmain( int argc, WCHAR *argv[] ) return 0; case 'i': argv++; argc--; - opt_cabinet_id = atoiW( argv[1] ); + opt_cabinet_id = wcstol( argv[1], NULL, 10 ); break; case 'm': argv++; argc--; - if (!strcmpiW( argv[1], noneW )) opt_compression = tcompTYPE_NONE; - else if (!strcmpiW( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; + if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; + else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { char *arg = strdupWtoA( CP_ACP, argv[1] ); @@ -679,7 +675,7 @@ int wmain( int argc, WCHAR *argv[] ) break; case 's': argv++; argc--; - opt_reserve_space = atoiW( argv[1] ); + opt_reserve_space = wcstol( argv[1], NULL, 10 ); break; case 'v': opt_verbose++; @@ -729,7 +725,7 @@ int wmain( int argc, WCHAR *argv[] ) if (argc > 1) /* check for destination dir as last argument */ { WCHAR *last = argv[argc - 1]; - if (last[0] && last[strlenW(last) - 1] == '\\') + if (last[0] && last[lstrlenW(last) - 1] == '\\') { opt_dest_dir = last; argv[--argc] = NULL;

1 0

Alexandre Julliard : clock: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 3e25a1b26f83ff3054754c261da65ac3a4932f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e25a1b26f83ff3054754c26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:46:22 2019 +0200 clock: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/Makefile.in | 3 ++- programs/clock/winclock.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index d4e8d65..060e2ff 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -1,7 +1,8 @@ MODULE = clock.exe -APPMODE = -mwindows IMPORTS = comdlg32 shell32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ main.c \ winclock.c diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index 53c3821..bfa04bd 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -23,8 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <math.h> #include <stdlib.h>

1 0