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

Hans Leidekker : wbemprox: Add a partial implementation of CIM_DataFile.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 97f9d6fd8f3a4622ea68cfa59243cdc1e8f5da20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f9d6fd8f3a4622ea68cfa59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:29:03 2013 +0200 wbemprox: Add a partial implementation of CIM_DataFile. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 613f3ff..1e42d3f 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 +IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ce97196..8878ddc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -37,6 +37,7 @@ #include "winternl.h" #include "winioctl.h" #include "winsvc.h" +#include "winver.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -51,6 +52,8 @@ static const WCHAR class_cdromdriveW[] = {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_datafileW[] = + {'C','I','M','_','D','a','t','a','F','i','l','e',0}; static const WCHAR class_directoryW[] = {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; static const WCHAR class_diskdriveW[] = @@ -262,10 +265,15 @@ static const struct column col_compsys[] = { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_datafile[] = +{ + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_directory[] = { { prop_accessmaskW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_KEY } + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY } }; static const struct column col_diskdrive[] = { @@ -498,6 +506,11 @@ struct record_computersystem UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_datafile +{ + const WCHAR *name; + const WCHAR *version; +}; struct record_directory { UINT32 accessmask; @@ -1092,6 +1105,121 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) return ret; } +static WCHAR *get_file_version( const WCHAR *filename ) +{ + static const WCHAR slashW[] = {'\\',0}, fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + VS_FIXEDFILEINFO *info; + DWORD size; + void *block; + WCHAR *ret; + + if (!(ret = heap_alloc( (4 * 5 + sizeof(fmtW) / sizeof(fmtW[0])) * sizeof(WCHAR) ))) return NULL; + if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) + { + heap_free( ret ); + return NULL; + } + if (!GetFileVersionInfoW( filename, 0, size, block ) || + !VerQueryValueW( block, slashW, (void **)&info, &size )) + { + heap_free( block ); + heap_free( ret ); + return NULL; + } + sprintfW( ret, fmtW, info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, + info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); + heap_free( block ); + return ret; +} + +static enum fill_status fill_datafile( struct table *table, const struct expr *cond ) +{ + static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; + struct record_datafile *rec; + UINT i, len, row = 0, offset = 0, num_expected_rows; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + DWORD drives = GetLogicalDrives(); + WIN32_FIND_DATAW data; + HANDLE handle; + struct dirstack *dirstack = alloc_dirstack(2); + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 8, sizeof(*rec) )) return FILL_STATUS_FAILED; + + for (i = 0; i < sizeof(drives); i++) + { + if (!(drives & (1 << i))) continue; + + root[0] = 'A' + i; + if (GetDriveTypeW( root ) != DRIVE_FIXED) continue; + + num_expected_rows = 0; + if (!seed_dirs( dirstack, cond, root[0], &num_expected_rows )) clear_dirstack( dirstack ); + + for (;;) + { + path = pop_dir( dirstack, &len ); + if (!(glob = build_glob( root[0], path, len ))) + { + status = FILL_STATUS_FAILED; + goto done; + } + if ((handle = FindFirstFileW( glob, &data )) != INVALID_HANDLE_VALUE) + { + do + { + if (!resize_table( table, row + 1, sizeof(*rec) )) + { + status = FILL_STATUS_FAILED; + goto done; + } + if (!strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName, dotdotW )) continue; + new_path = append_path( path, data.cFileName, &len ); + + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if (push_dir( dirstack, new_path, len )) continue; + heap_free( new_path ); + status = FILL_STATUS_FAILED; + goto done; + } + rec = (struct record_datafile *)(table->data + offset); + rec->name = build_name( root[0], new_path ); + rec->version = get_file_version( rec->name ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + else if (num_expected_rows && row == num_expected_rows - 1) + { + row++; + FindClose( handle ); + status = FILL_STATUS_FILTERED; + goto done; + } + offset += sizeof(*rec); + row++; + } + while (FindNextFileW( handle, &data )); + FindClose( handle ); + } + if (!peek_dir( dirstack )) break; + heap_free( glob ); + heap_free( path ); + } + } + +done: + free_dirstack( dirstack ); + heap_free( glob ); + heap_free( path ); + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static enum fill_status fill_directory( struct table *table, const struct expr *cond ) { static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; @@ -1870,6 +1998,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, + { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), 0, (BYTE *)data_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, 0, NULL, fill_diskpartition },

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeLib::SaveAllChanges.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: af3ae0c4f23366ea071dd1d48f7539ba6bad3a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3ae0c4f23366ea071dd1d48… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:30 2013 -0500 oleaut32: Implement ICreateTypeLib::SaveAllChanges. --- dlls/oleaut32/typelib.c | 1251 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1249 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af3ae0c4f23366ea071dd…

1 0

Andrew Eikum : oleaut32: When loading typelibs, skip over function default parameters as well.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 09d787d2d552baa184f72ed86a02ba98081e66b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d787d2d552baa184f72ed86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:55 2013 -0500 oleaut32: When loading typelibs, skip over function default parameters as well. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 295cac3..725bf2f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2310,6 +2310,8 @@ MSFT_DoFuncs(TLBContext* pcx, /* size without argument data */ optional = reclength - pFuncRec->nrargs*sizeof(MSFT_ParameterInfo); + if (pFuncRec->FKCCIC & 0x1000) + optional -= pFuncRec->nrargs * sizeof(INT); if (optional > FIELD_OFFSET(MSFT_FuncRecord, HelpContext)) ptfd->helpcontext = pFuncRec->HelpContext;

1 0

Andrew Eikum : oleaut32: Only copy previous function name if both are property accessors.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 0210cb93856df5432101a8df71da1f9060ed3860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0210cb93856df5432101a8df7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:58 2013 -0500 oleaut32: Only copy previous function name if both are property accessors. --- dlls/oleaut32/typelib.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 725bf2f..bb3be43 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2240,6 +2240,13 @@ static void MSFT_ResolveReferencedTypes(TLBContext *pcx, ITypeInfoImpl *pTI, TYP } } +static int TLB_is_propgetput(INVOKEKIND invkind) +{ + return (invkind == INVOKE_PROPERTYGET || + invkind == INVOKE_PROPERTYPUT || + invkind == INVOKE_PROPERTYPUTREF); +} + static void MSFT_DoFuncs(TLBContext* pcx, ITypeInfoImpl* pTI, @@ -2294,13 +2301,6 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - /* nameoffset is sometimes -1 on the second half of a propget/propput - * pair of functions */ - if ((nameoffset == -1) && (i > 0)) - ptfd->Name = ptfd_prev->Name; - else - ptfd->Name = MSFT_ReadName(pcx, nameoffset); - /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(pFuncRec->Info), pcx, recoffset); @@ -2351,6 +2351,15 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.oVft = pFuncRec->VtableOffset & ~1; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0) && + TLB_is_propgetput(ptfd_prev->funcdesc.invkind) && + TLB_is_propgetput(ptfd->funcdesc.invkind)) + ptfd->Name = ptfd_prev->Name; + else + ptfd->Name = MSFT_ReadName(pcx, nameoffset); + MSFT_GetTdesc(pcx, pFuncRec->DataType, &ptfd->funcdesc.elemdescFunc.tdesc,

1 0

Piotr Caban : msvcrt: Don't detect overflow in atoi implementation.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f3eb64ec7344e97067a4defa366896489cd1be20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eb64ec7344e97067a4defa3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 15:52:10 2013 +0200 msvcrt: Don't detect overflow in atoi implementation. --- dlls/msvcr100/msvcr100.c | 5 +++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 20 ++++++++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/string.c | 22 +++++++++++++++++++++- dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 11 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 149f132..d425455 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -484,6 +484,11 @@ size_t CDECL _aligned_msize(void *p, size_t alignment, size_t offset) return _msize(*alloc_ptr)-alignment-sizeof(void*); } +int CDECL MSVCR100_atoi(const char *str) +{ + return _atoi_l(str, NULL); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 370feb2..63a0caa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1629,7 +1629,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) MSVCR100_atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 99834dd..7550eb9 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -75,6 +75,7 @@ static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); static void* (__cdecl *p__aligned_offset_malloc)(size_t, size_t, size_t); static void (__cdecl *p__aligned_free)(void*); static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); +static int (__cdecl *p_atoi)(const char*); /* make sure we use the correct errno */ #undef errno @@ -104,6 +105,7 @@ static BOOL init(void) SET(p__aligned_offset_malloc, "_aligned_offset_malloc"); SET(p__aligned_free, "_aligned_free"); SET(p__aligned_msize, "_aligned_msize"); + SET(p_atoi, "atoi"); return TRUE; } @@ -358,6 +360,23 @@ static void test__aligned_msize(void) p__aligned_free(mem); } +static void test_atoi(void) +{ + int r; + + r = p_atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = p_atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = p_atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = p_atoi("4294967296"); + ok(r == 2147483647, "atoi(4294967296) = %d\n", r); +} + START_TEST(msvcr100) { if (!init()) @@ -367,4 +386,5 @@ START_TEST(msvcr100) test_wmemmove_s(); test_fread_s(); test__aligned_msize(); + test_atoi(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c38763a..e82f100 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1991,7 +1991,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2ed25c2..1a33fbb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -688,7 +688,7 @@ @ cdecl atan2(double double) msvcrt.atan2 @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl calloc(long long) msvcrt.calloc diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 0f985c7..afdab05 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -684,7 +684,7 @@ @ cdecl atan2(double double) msvcrt.atan2 @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl calloc(long long) msvcrt.calloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 47bf34f..521a69d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1310,7 +1310,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d76ab73..fd71ef4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1283,7 +1283,7 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcrt.atanf @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi ##don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9ad4cef..f2d1e20 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -893,7 +893,27 @@ int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) */ int __cdecl MSVCRT_atoi(const char *str) { - return MSVCRT__atoi_l(str, NULL); + BOOL minus = FALSE; + int ret = 0; + + if(!str) + return 0; + + while(isspace(*str)) str++; + + if(*str == '+') { + str++; + }else if(*str == '-') { + minus = TRUE; + str++; + } + + while(*str>='0' && *str<='9') { + ret = ret*10+*str-'0'; + str++; + } + + return minus ? -ret : ret; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 31314fd..6115377 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2521,6 +2521,23 @@ static void test__wcstoi64(void) return; } +static void test_atoi(void) +{ + int r; + + r = atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = atoi("4294967296"); + ok(r == 0, "atoi(4294967296) = %d\n", r); +} + START_TEST(string) { char mem[100]; @@ -2620,4 +2637,5 @@ START_TEST(string) test__atodbl(); test__stricmp(); test__wcstoi64(); + test_atoi(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d4755f4..e88ffa3 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -182,6 +182,7 @@ int __cdecl abs(int); int __cdecl atexit(void (*)(void)); double __cdecl atof(const char*); int __cdecl atoi(const char*); +int __cdecl _atoi_l(const char*,_locale_t); __msvcrt_long __cdecl atol(const char*); void* __cdecl calloc(size_t,size_t); #ifndef __i386__

1 0

Jason Edmeades : cmd: Fix handling of redundant information on goto/labels.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: dc4dd0cb97c55698bccf204db10e7b31901888a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4dd0cb97c55698bccf204db… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jun 2 00:17:30 2013 +0100 cmd: Fix handling of redundant information on goto/labels. --- programs/cmd/builtins.c | 34 +++++++++++++----- programs/cmd/tests/test_builtins.cmd | 55 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++ programs/cmd/wcmdmain.c | 22 ++++++----- 4 files changed, 97 insertions(+), 20 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1d9fc15..3c06e13 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2501,7 +2501,8 @@ void WCMD_give_help (const WCHAR *args) void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; - WCHAR current[MAX_PATH]; + WCHAR *labelend = NULL; + const WCHAR labelEndsW[] = {'>','<','|','&',' ',':','\t','\0'}; /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; @@ -2521,25 +2522,38 @@ void WCMD_goto (CMD_LIST **cmdList) { return; } - /* Support goto :label as well as goto label */ + /* Support goto :label as well as goto label plus remove trailing chars */ if (*paramStart == ':') paramStart++; + labelend = strpbrkW(paramStart, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("goto label: '%s'\n", wine_dbgstr_w(paramStart)); SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (*paramStart && + WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; - while (isspaceW (*str)) str++; + + /* Ignore leading whitespace or no-echo character */ + while (*str=='@' || isspaceW (*str)) str++; + + /* If the first real character is a : then this is a label */ if (*str == ':') { - DWORD index = 0; str++; - while (((current[index] = str[index])) && (!isspaceW (current[index]))) - index++; - /* ignore space at the end */ - current[index] = 0; - if (lstrcmpiW (current, paramStart) == 0) return; + /* Skip spaces between : and label */ + while (isspaceW (*str)) str++; + WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); + + /* Label ends at whitespace or redirection characters */ + labelend = strpbrkW(str, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + + if (lstrcmpiW (str, paramStart) == 0) return; } } WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); + context -> skip_rest = TRUE; } return; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 54070bc..f3aa1a9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2538,17 +2538,72 @@ echo %ErrorLevel% should still be 7 echo ------------ Testing GOTO ------------ if a==a goto dest1 +echo FAILURE at dest 1 :dest1 echo goto with no leading space worked +if a==a goto :dest1b +echo FAILURE at dest 1b +:dest1b +echo goto with colon and no leading space worked if b==b goto dest2 +echo FAILURE at dest 2 :dest2 echo goto with a leading space worked if c==c goto dest3 +echo FAILURE at dest 3 :dest3 echo goto with a leading tab worked if d==d goto dest4 +echo FAILURE at dest 4 :dest4(a)space@ echo goto with a following space worked +if e==e goto dest5 +echo FAILURE at dest 5 +:dest5&& echo FAILURE +echo goto with following amphersands worked + +del failure.txt >nul 2>&1 +if f==f goto dest6 +echo FAILURE at dest 6 +:dest6>FAILURE.TXT +if exist FAILURE.TXT echo FAILURE at dest 6 as file exists +echo goto with redirections worked +del FAILURE.TXT >nul 2>&1 + +:: some text that is ignored | dir >cmd_output | another test +if exist cmd_output echo FAILURE at dest 6 as file exists +echo Ignoring double colons worked +del cmd_output >nul 2>&1 + +rem goto a label which does not exist issues an error message and +rem acts the same as goto :EOF, and ensure ::label is never matched +del testgoto.bat >nul 2>&1 +echo goto :dest7 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 7 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest7>> testgoto.bat +echo echo FAILURE at dest 7 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +del testgoto.bat >nul 2>&1 +echo goto ::dest8 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 8 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest8>> testgoto.bat +echo echo FAILURE at dest 8 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +if g==g goto dest9 +echo FAILURE at dest 9 +:dest91 +echo FAILURE at dest 91 +@ : dest9>rubbish +echo label with mixed whitespace and no echo worked + +if h==h goto :dest10:this is ignored +echo FAILURE at dest 10 +:dest10:this is also ignored +echo Correctly ignored trailing information echo ------------ Testing PATH ------------ set WINE_backup_path=%path% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ebfe8cd..dd6ccb5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1294,9 +1294,15 @@ errorlevel zero, good(a)or_broken@errorlevel nonzero, bad 7 should still be 7 ------------ Testing GOTO ------------ goto with no leading space worked +goto with colon and no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +goto with following amphersands worked +goto with redirections worked +Ignoring double colons worked +label with mixed whitespace and no echo worked +Correctly ignored trailing information ------------ Testing PATH ------------ PATH=original PATH=try2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 95f2995..876bbef 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1813,7 +1813,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; - BOOL inRem = FALSE; + BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; BOOL inIf = FALSE; @@ -1910,9 +1910,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (curStringLen == 0 && curCopyTo == curString) { static const WCHAR forDO[] = {'d','o'}; - /* If command starts with 'rem ', ignore any &&, ( etc. */ - if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos)) { - inRem = TRUE; + /* If command starts with 'rem ' or identifies a label, ignore any &&, ( etc. */ + if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos) || + *curPos == ':') { + inOneLine = TRUE; } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { inFor = TRUE; @@ -1971,11 +1972,12 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } } - /* Nothing 'ends' a REM statement and &&, quotes etc are ineffective, - so just use the default processing ie skip character specific - matching below */ - if (!inRem) thisChar = *curPos; - else thisChar = 'X'; /* Character with no special processing */ + /* Nothing 'ends' a one line statement (e.g. REM or :labels mean + the &&, quotes and redirection etc are ineffective, so just force + the use of the default processing by skipping character specific + matching below) */ + if (!inOneLine) thisChar = *curPos; + else thisChar = 'X'; /* Character with no special processing */ lastWasWhiteSpace = FALSE; /* Will be reset below */ lastWasCaret = FALSE; @@ -2225,7 +2227,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WCHAR *extraData; WINE_TRACE("Need to read more data as outstanding brackets or carets\n"); - inRem = FALSE; + inOneLine = FALSE; prevDelim = CMD_NONE; inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0

Jason Edmeades : cmd: Fix tilda parameter expansion when arg is empty.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 2b9649d9db1f4b769f6a80407ae2ea6dc364aaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9649d9db1f4b769f6a80407… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jun 2 21:29:58 2013 +0100 cmd: Fix tilda parameter expansion when arg is empty. --- programs/cmd/batch.c | 12 +++++++----- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 09081f4..294a153 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -514,11 +514,13 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) - return; - - exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, - &fileInfo); + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + exists = FALSE; + fullfilename[0] = 0x00; + } else { + exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, + &fileInfo); + } /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ if (memchrW(firstModifier, 'a', modifierLen) != NULL) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f3aa1a9..45617cf 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -363,6 +363,7 @@ for %%i in ("d e" f) do echo %%~dpi for %%i in ("g h" i) do echo %%~sdi for %%i in ("g h" i) do echo %%~dsi for %%i in ("j k" l.eh) do echo '%%~xsi' +for %%i in ("") do echo '%%~i,%%~fi,%%~di,%%~pi,%%~ni,%%~xi,%%~si,%%~ai,%%~ti,%%~zi' echo --- in parameters for %%i in ("A B" C) do call :echoFun %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dd6ccb5..99ed738 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -319,6 +319,7 @@ N @drive@ '' '.eh' +',,,,,,,,,' --- in parameters "A B" C

1 0

Dmitry Timoshkov : shlwapi: Correct .spec parameter types for Assoc* APIs.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f49de6aa087e63d20ae061775bedafe56f45ebc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49de6aa087e63d20ae061775… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 4 15:11:06 2013 +0900 shlwapi: Correct .spec parameter types for Assoc* APIs. --- dlls/shlwapi/shlwapi.spec | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index aad095e..b7aac08 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -548,13 +548,13 @@ @ stdcall AssocCreate(int128 ptr ptr) @ stdcall AssocGetPerceivedType(wstr ptr ptr ptr) -@ stdcall AssocIsDangerous(long) -@ stdcall AssocQueryKeyA(long long str ptr ptr) -@ stdcall AssocQueryKeyW(long long wstr ptr ptr) -@ stdcall AssocQueryStringA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr ptr ptr ptr) -@ stdcall AssocQueryStringW(long long ptr ptr ptr ptr) +@ stdcall AssocIsDangerous(wstr) +@ stdcall AssocQueryKeyA(long long str str ptr) +@ stdcall AssocQueryKeyW(long long wstr wstr ptr) +@ stdcall AssocQueryStringA(long long str str ptr ptr) +@ stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr) +@ stdcall AssocQueryStringByKeyW(long long ptr wstr ptr ptr) +@ stdcall AssocQueryStringW(long long wstr wstr ptr ptr) @ stdcall ChrCmpIA(long long) @ stdcall ChrCmpIW(long long) @ stdcall ColorAdjustLuma(long long long)

1 0

Christian Costa : d3dx9_36: Fix typo.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 539d28a11289ca4c9db6fe080497803a8776b771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539d28a11289ca4c9db6fe080… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:31:52 2013 +0200 d3dx9_36: Fix typo. --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index be80ede..1924c07 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5631,7 +5631,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_resource(base, data, &ptr); if (hr != D3D_OK) { - WARN("Failed to parse data\n"); + WARN("Failed to parse resource\n"); goto err_out; } }

1 0

Christian Costa : d3dx9_36: Define D3DXSPRITE_xxx flags in hex for better readability.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 785921ff4965d9004512dc9b53bcc5c31994e24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=785921ff4965d9004512dc9b5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 4 09:32:00 2013 +0200 d3dx9_36: Define D3DXSPRITE_xxx flags in hex for better readability. --- include/d3dx9core.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 252d5db..b6226d6 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -28,15 +28,15 @@ implementing all dlls from d3dx9_24 to d3dx9_36 */ #define D3DX_VERSION 0x0902 #define D3DX_SDK_VERSION 36 -#define D3DXSPRITE_DONOTSAVESTATE 1 -#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 2 -#define D3DXSPRITE_OBJECTSPACE 4 -#define D3DXSPRITE_BILLBOARD 8 -#define D3DXSPRITE_ALPHABLEND 16 -#define D3DXSPRITE_SORT_TEXTURE 32 -#define D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 64 -#define D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 128 -#define D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 256 +#define D3DXSPRITE_DONOTSAVESTATE 0x00000001 +#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002 +#define D3DXSPRITE_OBJECTSPACE 0x00000004 +#define D3DXSPRITE_BILLBOARD 0x00000008 +#define D3DXSPRITE_ALPHABLEND 0x00000010 +#define D3DXSPRITE_SORT_TEXTURE 0x00000020 +#define D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 0x00000040 +#define D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 0x00000080 +#define D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 0x00000100 /********************************************** ******************** GUIDs *******************

1 0