August 2018 - Wine-Devel - list.winehq.org

[PATCH] dmloader: Remove an unused impl_from_ helper
by Michael Stefaniuc Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/container.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index a277bf0a30..3232758b57 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -194,11 +194,6 @@ static const IDirectMusicContainerVtbl dmcontainer_vtbl = { }; /* IDirectMusicObject part: */ -static inline IDirectMusicContainerImpl *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IDirectMusicObject_iface); -} - static HRESULT WINAPI cont_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { -- 2.14.4

1 0

[PATCH] ntdll: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/debugtools.c | 2 +- dlls/ntdll/directory.c | 16 ++++++++-------- dlls/ntdll/file.c | 2 +- dlls/ntdll/heap.c | 2 +- dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/path.c | 12 ++++++------ dlls/ntdll/relay.c | 4 ++-- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/time.c | 3 +-- dlls/ntdll/virtual.c | 2 +- 16 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 7e3aec4d1e..53a8b06882 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1556,7 +1556,7 @@ static OLEMISC get_olemisc_value(const WCHAR *str, int len) int min, max; min = 0; - max = sizeof(olemisc_values)/sizeof(struct olemisc_entry) - 1; + max = ARRAY_SIZE(olemisc_values) - 1; while (min <= max) { @@ -3131,7 +3131,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) tmp = strchrW(tmp, '_') + 1; tmp = strchrW(tmp, '_') + 1; if (dir_info->FileNameLength - (tmp - dir_info->FileName) * sizeof(WCHAR) == sizeof(wine_trailerW) && - !memicmpW( tmp, wine_trailerW, sizeof(wine_trailerW) / sizeof(WCHAR) )) + !memicmpW( tmp, wine_trailerW, ARRAY_SIZE( wine_trailerW ))) { /* prefer a non-Wine manifest if we already have one */ /* we'll still load the builtin dll if specified through DllOverrides */ diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 2c64106072..066181b1d1 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -208,7 +208,7 @@ static const char *iocodex(DWORD code) { unsigned int i; static char buffer[25]; - for(i=0; i<sizeof(iocodextable)/sizeof(struct iocodexs); i++) + for(i=0; i<ARRAY_SIZE(iocodextable); i++) if (code==iocodextable[i].code) return iocodextable[i].codex; sprintf(buffer, "IOCTL_CODE_%x", (int)code); diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index 2c8287d225..254673b473 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -175,7 +175,7 @@ static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_chan ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); if (*format == '\1') /* special magic to avoid standard prefix */ format++; - else if (cls < sizeof(classes)/sizeof(classes[0])) + else if (cls < ARRAY_SIZE( classes )) ret += wine_dbg_printf( "%s:%s:%s ", classes[cls], channel->name, function ); } if (format) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4655a63450..c48b9e97ea 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1008,7 +1008,7 @@ struct vol_caps static struct fs_cache *look_up_fs_cache( dev_t dev ) { int i; - for (i = 0; i < sizeof(fs_cache)/sizeof(fs_cache[0]); i++) + for (i = 0; i < ARRAY_SIZE( fs_cache ); i++) if (fs_cache[i].dev == dev) return fs_cache+i; return NULL; @@ -1033,7 +1033,7 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /* Add a new entry */ - for (i = 0; i < sizeof(fs_cache)/sizeof(fs_cache[0]); i++) + for (i = 0; i < ARRAY_SIZE( fs_cache ); i++) if (fs_cache[i].dev == 0) { /* This entry is empty, use it */ @@ -1455,8 +1455,8 @@ static BOOL append_entry( struct dir_data *data, const char *long_name, if (short_name) { short_len = ntdll_umbstowcs( 0, short_name, strlen(short_name), - short_nameW, sizeof(short_nameW) / sizeof(WCHAR) - 1 ); - if (short_len == -1) short_len = sizeof(short_nameW) / sizeof(WCHAR) - 1; + short_nameW, ARRAY_SIZE( short_nameW ) - 1 ); + if (short_len == -1) short_len = ARRAY_SIZE( short_nameW ) - 1; for (i = 0; i < short_len; i++) short_nameW[i] = toupperW( short_nameW[i] ); } else /* generate a short name if necessary */ @@ -2291,7 +2291,7 @@ static void init_redirects(void) { windir.dev = st.st_dev; windir.ino = st.st_ino; - nb_redirects = sizeof(redirects) / sizeof(redirects[0]); + nb_redirects = ARRAY_SIZE( redirects ); for (i = 0; i < nb_redirects; i++) { if (!redirects[i].dos_target) continue; @@ -2473,11 +2473,11 @@ static inline int get_dos_prefix_len( const UNICODE_STRING *name ) if (name->Length >= sizeof(nt_prefixW) && !memcmp( name->Buffer, nt_prefixW, sizeof(nt_prefixW) )) - return sizeof(nt_prefixW) / sizeof(WCHAR); + return ARRAY_SIZE( nt_prefixW ); if (name->Length >= sizeof(dosdev_prefixW) && - !memicmpW( name->Buffer, dosdev_prefixW, sizeof(dosdev_prefixW)/sizeof(WCHAR) )) - return sizeof(dosdev_prefixW) / sizeof(WCHAR); + !memicmpW( name->Buffer, dosdev_prefixW, ARRAY_SIZE( dosdev_prefixW ))) + return ARRAY_SIZE( dosdev_prefixW ); return 0; } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b9d24251f2..b39e931452 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3256,7 +3256,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } break; case FileFsAttributeInformation: - if (length < offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName[sizeof(ntfsW)/sizeof(WCHAR)] )) + if (length < offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName[ARRAY_SIZE( ntfsW )] )) io->u.Status = STATUS_BUFFER_TOO_SMALL; else { diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ca08f9d854..44d49bca99 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -124,7 +124,7 @@ static const SIZE_T HEAP_freeListSizes[] = { 0x200, 0x400, 0x1000, ~0UL }; -#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes) / sizeof(HEAP_freeListSizes[0]) + HEAP_NB_SMALL_FREE_LISTS) +#define HEAP_NB_FREE_LISTS (ARRAY_SIZE( HEAP_freeListSizes ) + HEAP_NB_SMALL_FREE_LISTS) typedef union { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index df206e848d..8d18af8b86 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1878,7 +1878,7 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) if (!relocs->Size) return STATUS_SUCCESS; if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; - if (nt->FileHeader.NumberOfSections > sizeof(protect_old)/sizeof(protect_old[0])) + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) return STATUS_INVALID_IMAGE_FORMAT; sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + @@ -2275,7 +2275,7 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) strcpyW( p, user_shared_data->NtSystemRoot ); p += strlenW(p); memcpy( p, winsxsW, sizeof(winsxsW) ); - p += sizeof(winsxsW) / sizeof(WCHAR); + p += ARRAY_SIZE( winsxsW ); memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); *p++ = '\\'; @@ -2840,7 +2840,7 @@ NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LP 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','m','a','g','e',' ','F','i','l','e',' ', 'E','x','e','c','u','t','i','o','n',' ','O','p','t','i','o','n','s','\\'}; - WCHAR path[MAX_PATH + sizeof(optionsW)/sizeof(WCHAR)]; + WCHAR path[MAX_PATH + ARRAY_SIZE( optionsW )]; OBJECT_ATTRIBUTES attr; UNICODE_STRING name_str; HANDLE hkey; @@ -2862,7 +2862,7 @@ NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LP name_str.Length = sizeof(optionsW) + len; name_str.MaximumLength = name_str.Length; memcpy( path, optionsW, sizeof(optionsW) ); - memcpy( path + sizeof(optionsW)/sizeof(WCHAR), p, len ); + memcpy( path + ARRAY_SIZE( optionsW ), p, len ); if ((status = NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr ))) return status; if (type == REG_DWORD) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 785978ced2..ccc95e3d64 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1116,12 +1116,12 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRIN goto done; } memcpy( nt->Buffer, unix_prefixW, sizeof(unix_prefixW) ); - ntdll_umbstowcs( 0, path, lenA, nt->Buffer + sizeof(unix_prefixW)/sizeof(WCHAR), lenW ); - lenW += sizeof(unix_prefixW)/sizeof(WCHAR); + ntdll_umbstowcs( 0, path, lenA, nt->Buffer + ARRAY_SIZE( unix_prefixW ), lenW ); + lenW += ARRAY_SIZE( unix_prefixW ); nt->Buffer[lenW] = 0; nt->Length = lenW * sizeof(WCHAR); nt->MaximumLength = nt->Length + sizeof(WCHAR); - for (p = nt->Buffer + sizeof(unix_prefixW)/sizeof(WCHAR); *p; p++) if (*p == '/') *p = '\\'; + for (p = nt->Buffer + ARRAY_SIZE( unix_prefixW ); *p; p++) if (*p == '/') *p = '\\'; status = STATUS_SUCCESS; } goto done; @@ -1138,12 +1138,12 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRIN memcpy( nt->Buffer, prefixW, sizeof(prefixW) ); nt->Buffer[4] += drive; - ntdll_umbstowcs( 0, path, lenA, nt->Buffer + sizeof(prefixW)/sizeof(WCHAR), lenW ); - lenW += sizeof(prefixW)/sizeof(WCHAR); + ntdll_umbstowcs( 0, path, lenA, nt->Buffer + ARRAY_SIZE( prefixW ), lenW ); + lenW += ARRAY_SIZE( prefixW ); nt->Buffer[lenW] = 0; nt->Length = lenW * sizeof(WCHAR); nt->MaximumLength = nt->Length + sizeof(WCHAR); - for (p = nt->Buffer + sizeof(prefixW)/sizeof(WCHAR); *p; p++) if (*p == '/') *p = '\\'; + for (p = nt->Buffer + ARRAY_SIZE( prefixW ); *p; p++) if (*p == '/') *p = '\\'; done: RtlFreeHeap( GetProcessHeap(), 0, cwd ); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 255a5259e1..4ebd1fd688 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -1197,10 +1197,10 @@ void WINAPI DECLSPEC_HIDDEN __regs_SNOOP_Entry( void **stack ) while (*rets) { - for (i=0;i<sizeof((*rets)->entry)/sizeof((*rets)->entry[0]);i++) + for (i=0;i<ARRAY_SIZE( (*rets)->entry );i++) if (!(*rets)->entry[i].origreturn) break; - if (i!=sizeof((*rets)->entry)/sizeof((*rets)->entry[0])) + if (i!=ARRAY_SIZE( (*rets)->entry )) break; rets = &((*rets)->next); } diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5e35907484..1986389077 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -940,7 +940,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= ARRAY_SIZE(handlers)) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 55a711048c..5a44914489 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -838,7 +838,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= ARRAY_SIZE(handlers)) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 23630857ef..384615fc26 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2221,7 +2221,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= ARRAY_SIZE(handlers)) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index f88beec8d8..f5231e7b34 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1006,7 +1006,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= ARRAY_SIZE(handlers)) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e751082d72..4fb80bb378 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3247,7 +3247,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= ARRAY_SIZE(handlers)) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index e2cd770af0..b0eefb8465 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -605,8 +605,7 @@ static BOOL match_tz_name(const char* tz_name, return TRUE; strcpyW(key.key_name, reg_tzi->TimeZoneKeyName); - match = bsearch(&key, mapping, sizeof(mapping)/sizeof(mapping[0]), - sizeof(mapping[0]), compare_tz_key); + match = bsearch(&key, mapping, ARRAY_SIZE(mapping), sizeof(mapping[0]), compare_tz_key); if (!match) return TRUE; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index befb59c436..af1509eae5 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1416,7 +1416,7 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, SIZE_T m memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) goto error; header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; - if (nt->FileHeader.NumberOfSections > sizeof(sections)/sizeof(*sections)) goto error; + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( sections )) goto error; if (header_start + sizeof(*sections) * nt->FileHeader.NumberOfSections > header_end) goto error; /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, * copying the headers into local memory is necessary to properly load such applications. */ -- 2.14.4

1 0

[PATCH] dmime: Remove unused impl_from_ helpers
by Michael Stefaniuc Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/audiopath.c | 5 ----- dlls/dmime/graph.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index bdd92013ea..21aaa4d412 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -39,11 +39,6 @@ static inline struct IDirectMusicAudioPathImpl *impl_from_IDirectMusicAudioPath( return CONTAINING_RECORD(iface, struct IDirectMusicAudioPathImpl, IDirectMusicAudioPath_iface); } -static inline struct IDirectMusicAudioPathImpl *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, struct IDirectMusicAudioPathImpl, dmobj.IDirectMusicObject_iface); -} - static inline struct IDirectMusicAudioPathImpl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, struct IDirectMusicAudioPathImpl, dmobj.IPersistStream_iface); diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index fadd51efbf..fafd4ecfff 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -35,11 +35,6 @@ static inline IDirectMusicGraphImpl *impl_from_IDirectMusicGraph(IDirectMusicGra return CONTAINING_RECORD(iface, IDirectMusicGraphImpl, IDirectMusicGraph_iface); } -static inline IDirectMusicGraphImpl *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicGraphImpl, dmobj.IDirectMusicObject_iface); -} - static inline IDirectMusicGraphImpl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicGraphImpl, dmobj.IPersistStream_iface); -- 2.14.4

1 0

[PATCH] cmd: Handle quotes when parsing the folders in the PATH environment variable
by Fabian Maurer Aug. 2, 2018

Aug. 2, 2018

Semicolons are also allowed inside a path, as long as they are quoted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45552 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/cmd/tests/test_builtins.cmd | 17 +++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ programs/cmd/wcmdmain.c | 27 +++++++++++++++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b9e9b259a9..775f21bbdc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -507,6 +507,23 @@ rem Only the final quote ends the string set "WINE_FOO=apple"banana"grape"orange echo '%WINE_FOO%' set WINE_FOO= +rem set PATH must work with quotes +set PATH_BACKUP=%PATH% +mkdir folder +mkdir "fol;der" +echo echo I'm here! > "fol;der\sub1.bat" +echo echo I'm here! > folder\sub1.bat +set PATH=nothing;"fol;der" +call sub1 +set PATH="folder +call sub1 +set PATH=folder" +call sub1 +del "fol;der\sub1.bat" +del folder\sub1.bat +rmdir "fol;der" +rmdir folder +PATH=%PATH_BACKUP% echo ------------ Testing variable expansion ------------ call :setError 0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3118359265..ea4157c09d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -475,6 +475,9 @@ foo 'jim fred' 'jim' 'apple"banana"grape' +I'm here!@space@ +I'm here!@space@ +I'm here!@space@ ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fe2d574e5..5135be4751 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1099,24 +1099,41 @@ void WCMD_run_program (WCHAR *command, BOOL called) wine_dbgstr_w(stemofsearch)); while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; + int length = 0; WCHAR *pos = NULL; BOOL found = FALSE; + BOOL inside_quotes = FALSE; /* Work on the first directory on the search path */ - pos = strchrW(pathposn, ';'); - if (pos) { + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } + + if (*pos) { /* Reached semicolon */ memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); thisDir[(pos-pathposn)] = 0x00; pathposn = pos+1; - - } else { + } else { /* Reached string end */ strcpyW(thisDir, pathposn); pathposn = NULL; } + /* Remove quotes */ + length = strlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; + + if (*thisDir != '"') + strcpyW(temp, thisDir); + else + strcpyW(temp, thisDir + 1); + /* Since you can have eg. ..\.. on the path, need to expand to full information */ - strcpyW(temp, thisDir); GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */ -- 2.18.0

1 0

C# DLLs for tests
by Fabian Maurer Aug. 2, 2018

Aug. 2, 2018

Hello there, I'm still on tests for mscoree, and for that I need NET dlls to run the tests with. The DLLs can be compile with csc.exe, but that needs to be implemented somehow. Right now there are two ways we could implement that: 1) Compile DLL at build time (optional build dependency on mono) 2) Compile DLL at runtime (wine-mono would need to ship csc.exe, native .NET already has it) I'm not sure which way is preferred, both would be feasible, I guess. Which one should I take? Regards, Fabian Maurer

4 5

[PATCH 13/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_push_back.
by Hua Meng Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8fe5294d06..58e546cdf3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2216,10 +2216,24 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_to_at_least_wi /* ?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_push_back, 12) void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len1, MSVCP_size_t *len2) + _Concurrent_vector_base_v4 *this, MSVCP_size_t element_size, MSVCP_size_t *idx) { - FIXME("(%p %ld %p) stub\n", this, len1, len2); - return NULL; + MSVCP_size_t index, seg, segment_base; + void *data; + + TRACE("(%p %ld %p)\n", this, element_size, idx); + + do { + index = this->early_size; + _Concurrent_vector_base_v4__Internal_reserve(this, index + 1, + element_size, MSVCP_SIZE_T_MAX / element_size); + } while(InterlockedCompareExchangeSizeT(&this->early_size, index + 1, index) != index); + seg = _vector_base_v4__Segment_index_of(index); + segment_base = (seg == 0) ? 0 : (1 << seg); + data = (BYTE*)this->segment[seg] + element_size * (index - segment_base); + *idx = index; + + return data; } /* ?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z */ -- 2.11.0

1 0

[PATCH 12/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_resize.
by Hua Meng Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 6e79125640..8fe5294d06 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2226,11 +2226,37 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( /* ?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00P6AXPEAX0(a)ZP6AX1PEBX0@Z3(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_resize, 28) void __thiscall _Concurrent_vector_base_v4__Internal_resize( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len1, MSVCP_size_t len2, - MSVCP_size_t len3, void (__cdecl *clear)(void*, MSVCP_size_t), + _Concurrent_vector_base_v4 *this, MSVCP_size_t resize, MSVCP_size_t element_size, + MSVCP_size_t max_size, void (__cdecl *clear)(void*, MSVCP_size_t), void (__cdecl *copy)(void*, const void*, MSVCP_size_t), const void *v) { - FIXME("(%p %ld %ld %ld %p %p %p) stub\n", this, len1, len2, len3, clear, copy, v); + MSVCP_size_t size, seg_no, end_seg_no, clear_element; + + TRACE("(%p %ld %ld %ld %p %p %p)\n", this, resize, element_size, max_size, clear, copy, v); + + if(resize > max_size) _vector_base_v4__Internal_throw_exception(this, 0); + size = this->early_size; + if(resize > size) + _Concurrent_vector_base_v4__Internal_grow_to_at_least_with_result(this, + resize, element_size, copy, v); + else if(resize == 0) + _Concurrent_vector_base_v4__Internal_clear(this, clear); + else if(resize < size) + { + seg_no = _vector_base_v4__Segment_index_of(size - 1); + end_seg_no = _vector_base_v4__Segment_index_of(resize - 1); + clear_element = size - (seg_no ? 1 << seg_no : 2); + if(clear_element > 0) + clear(this->segment[seg_no], clear_element); + if(seg_no) seg_no--; + for(; seg_no > end_seg_no; seg_no--) + clear(this->segment[seg_no], 1 << seg_no); + clear_element = (1 << (end_seg_no + 1)) - resize; + if(clear_element > 0) + clear((BYTE**)this->segment[end_seg_no] + element_size * (resize - ((1 << end_seg_no) & ~1)), + clear_element); + this->early_size = resize; + } } /* ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z */ -- 2.11.0

1 0

[PATCH 11/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_compact.
by Hua Meng Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 5907c0b88b..6e79125640 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1784,6 +1784,13 @@ typedef struct __Concurrent_vector_base_v4 #define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) #define SEGMENT_SIZE (sizeof(void*) * 8) +typedef struct compact_block +{ + MSVCP_size_t first_block; + void *blocks[SEGMENT_SIZE]; + int size_check; +}compact_block; + /* based on wined3d_log2i from wined3d.h */ /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) @@ -1997,12 +2004,58 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_clear( /* ?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_compact, 20) void * __thiscall _Concurrent_vector_base_v4__Internal_compact( - _Concurrent_vector_base_v4 *this, MSVCP_size_t len, void *v, + _Concurrent_vector_base_v4 *this, MSVCP_size_t element_size, void *v, void (__cdecl *clear)(void*, MSVCP_size_t), void (__cdecl *copy)(void*, const void*, MSVCP_size_t)) { - FIXME("(%p %ld %p %p %p) stub\n", this, len, v, clear, copy); - return NULL; + compact_block *b; + MSVCP_size_t size, alloc_size, seg_no, alloc_seg, copy_element, clear_element; + int i; + + TRACE("(%p %ld %p %p %p)\n", this, element_size, v, clear, copy); + + size = this->early_size; + alloc_size = _Concurrent_vector_base_v4__Internal_capacity(this); + if(alloc_size == 0) return NULL; + alloc_seg = _vector_base_v4__Segment_index_of(alloc_size - 1); + if(!size) { + this->first_block = 0; + b = v; + b->first_block = alloc_seg + 1; + memset(b->blocks, 0, sizeof(b->blocks)); + memcpy(b->blocks, this->segment, + (alloc_seg + 1) * sizeof(this->segment[0])); + memset(this->segment, 0, sizeof(this->segment[0]) * (alloc_seg + 1)); + return v; + } + seg_no = _vector_base_v4__Segment_index_of(size - 1); + if(this->first_block == (seg_no + 1) && seg_no == alloc_seg) return NULL; + b = v; + b->first_block = this->first_block; + memset(b->blocks, 0, sizeof(b->blocks)); + memcpy(b->blocks, this->segment, + (alloc_seg + 1) * sizeof(this->segment[0])); + if(this->first_block == (seg_no + 1) && seg_no != alloc_seg) { + memset(b->blocks, 0, sizeof(b->blocks[0]) * (seg_no + 1)); + memset(&this->segment[seg_no + 1], 0, sizeof(this->segment[0]) * (alloc_seg - seg_no)); + return v; + } + memset(this->segment, 0, + (alloc_seg + 1) * sizeof(this->segment[0])); + this->first_block = 0; + _Concurrent_vector_base_v4__Internal_reserve(this, size, element_size, + MSVCP_SIZE_T_MAX / element_size); + for(i = 0; i < seg_no; i++) + copy(this->segment[i], b->blocks[i], i ? 1 << i : 2); + copy_element = size - ((1 << seg_no) & ~1); + if(copy_element > 0) + copy(this->segment[seg_no], b->blocks[seg_no], copy_element); + for(i = 0; i < seg_no; i++) + clear(b->blocks[i], i ? 1 << i : 2); + clear_element = size - ((1 << seg_no) & ~1); + if(clear_element > 0) + clear(b->blocks[seg_no], clear_element); + return v; } /* ?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXPBXI@Z(a)Z */ -- 2.11.0

1 0

[PATCH 10/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_swap.
by Hua Meng Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 72545fad5b..5907c0b88b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2184,9 +2184,19 @@ void __thiscall _Concurrent_vector_base_v4__Internal_resize( /* ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_swap, 8) void __thiscall _Concurrent_vector_base_v4__Internal_swap( - _Concurrent_vector_base_v4 *this, const _Concurrent_vector_base_v4 *v) + _Concurrent_vector_base_v4 *this, _Concurrent_vector_base_v4 *v) { - FIXME("(%p %p) stub\n", this, v); + _Concurrent_vector_base_v4 temp; + + TRACE("(%p %p)\n", this, v); + + temp = *this; + *this = *v; + *v = temp; + if(v->segment == this->storage) + v->segment = v->storage; + if(this->segment == v->storage) + this->segment = this->storage; } #endif -- 2.11.0

1 0

[PATCH 09/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_grow_to_at_least_with_result.
by Hua Meng Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8f7d4208d7..72545fad5b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2133,8 +2133,30 @@ MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_to_at_least_wi _Concurrent_vector_base_v4 *this, MSVCP_size_t count, MSVCP_size_t element_size, void (__cdecl *copy)(void*, const void*, MSVCP_size_t), const void *v) { - FIXME("(%p %ld %ld %p %p) stub\n", this, count, element_size, copy, v); - return 0; + MSVCP_size_t size, seg_no, last_seg_no, remain_size; + + TRACE("(%p %ld %ld %p %p)\n", this, count, element_size, copy, v); + + _Concurrent_vector_base_v4__Internal_reserve(this, count, element_size, + MSVCP_SIZE_T_MAX / element_size); + do { + size = this->early_size; + if(size >= count) return size; + } while(InterlockedCompareExchangeSizeT(&this->early_size, count, size) != size); + + seg_no = size ? _vector_base_v4__Segment_index_of(size - 1) : 0; + last_seg_no = _vector_base_v4__Segment_index_of(count - 1); + remain_size = min(count, 1 << (seg_no + 1)) - size; + if(remain_size > 0) + copy(((BYTE**)this->segment[seg_no] + element_size * (size - ((1 << seg_no) & ~1))), v, + remain_size); + if(seg_no != last_seg_no) + { + for(seg_no++; seg_no < last_seg_no; seg_no++) + copy(this->segment[seg_no], v, 1 << seg_no); + copy(this->segment[last_seg_no], v, count - (1 << last_seg_no)); + } + return size; } /* ?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z */ -- 2.11.0

1 0