August 2011 - Wine-commits - list.winehq.org

Bernhard Loos : msi: Make WHEREVIEW able to deal directly with multiple tables.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: a52c2bf9417a965a087a2e4f76fde78b7b3c7f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52c2bf9417a965a087a2e4f7… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Aug 26 04:53:34 2011 +0200 msi: Make WHEREVIEW able to deal directly with multiple tables. --- dlls/msi/query.h | 22 ++- dlls/msi/sql.y | 8 +- dlls/msi/tests/db.c | 2 +- dlls/msi/update.c | 23 +-- dlls/msi/where.c | 634 ++++++++++++++++++++++++++++++++++++--------------- 5 files changed, 478 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a52c2bf9417a965a087a2…

1 0

Bernhard Loos : msi: Protected primary keys against modification.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: abd1174941b7e074d3cd14c3a121febd6eed96b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd1174941b7e074d3cd14c3a… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Aug 26 04:53:39 2011 +0200 msi: Protected primary keys against modification. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 50 ++++++++++++++++++++++++++------------------- dlls/msi/where.c | 56 +++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 79 insertions(+), 28 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2524752..998970b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -809,6 +809,7 @@ extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, LPCWSTR ) DECLSPEC_ extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ) DECLSPEC_HIDDEN; +extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 0e4fb8a..7acbfc7 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -994,6 +994,34 @@ MSIRECORD *MSI_CloneRecord(MSIRECORD *rec) return clone; } +BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) +{ + if (a->fields[field].type != b->fields[field].type) + return FALSE; + + switch (a->fields[field].type) + { + case MSIFIELD_NULL: + break; + + case MSIFIELD_INT: + if (a->fields[field].u.iVal != b->fields[field].u.iVal) + return FALSE; + break; + + case MSIFIELD_WSTR: + if (strcmpW(a->fields[field].u.szwVal, b->fields[field].u.szwVal)) + return FALSE; + break; + + case MSIFIELD_STREAM: + default: + return FALSE; + } + return TRUE; +} + + BOOL MSI_RecordsAreEqual(MSIRECORD *a, MSIRECORD *b) { UINT i; @@ -1003,28 +1031,8 @@ BOOL MSI_RecordsAreEqual(MSIRECORD *a, MSIRECORD *b) for (i = 0; i <= a->count; i++) { - if (a->fields[i].type != b->fields[i].type) + if (!MSI_RecordsAreFieldsEqual( a, b, i )) return FALSE; - - switch (a->fields[i].type) - { - case MSIFIELD_NULL: - break; - - case MSIFIELD_INT: - if (a->fields[i].u.iVal != b->fields[i].u.iVal) - return FALSE; - break; - - case MSIFIELD_WSTR: - if (strcmpW(a->fields[i].u.szwVal, b->fields[i].u.szwVal)) - return FALSE; - break; - - case MSIFIELD_STREAM: - default: - return FALSE; - } } return TRUE; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index d8ac5e8..0742244 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -262,9 +262,10 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; - UINT r, offset = 0, reduced_mask = 0; + UINT i, r, offset = 0; JOINTABLE *table = wv->tables; UINT *rows; + UINT mask_copy = mask; TRACE("%p %d %p %08x\n", wv, row, rec, mask ); @@ -275,28 +276,54 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if (r != ERROR_SUCCESS) return r; - if(mask >= 1 << wv->col_count) + if (mask >= 1 << wv->col_count) return ERROR_INVALID_PARAMETER; do { + for (i = 0; i < table->col_count; i++) { + UINT type; + + if (!(mask_copy & (1 << i))) + continue; + r = table->view->ops->get_column_info(table->view, i + 1, NULL, + &type, NULL, NULL ); + if (r != ERROR_SUCCESS) + return r; + if (type & MSITYPE_KEY) + return ERROR_FUNCTION_FAILED; + } + mask_copy >>= table->col_count; + } + while (mask_copy && (table = table->next)); + + table = wv->tables; + + do + { const UINT col_count = table->col_count; UINT i; MSIRECORD *reduced; + UINT reduced_mask = (mask >> offset) & ((1 << col_count) - 1); + + if (!reduced_mask) + { + offset += col_count; + continue; + } reduced = MSI_CreateRecord(col_count); if (!reduced) return ERROR_FUNCTION_FAILED; - for (i = 0; i < col_count; i++) + for (i = 1; i <= col_count; i++) { - r = MSI_RecordCopyField(rec, i + offset + 1, reduced, i + 1); + r = MSI_RecordCopyField(rec, i + offset, reduced, i); if (r != ERROR_SUCCESS) break; } offset += col_count; - reduced_mask = mask >> (wv->col_count - offset) & ((1 << col_count) - 1); if (r == ERROR_SUCCESS) r = table->view->ops->set_row(table->view, rows[table->table_index], reduced, reduced_mask); @@ -644,13 +671,28 @@ static UINT join_find_row( MSIWHEREVIEW *wv, MSIRECORD *rec, UINT *row ) static UINT join_modify_update( struct tagMSIVIEW *view, MSIRECORD *rec ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; - UINT r, row; + UINT r, row, i, mask = 0; + MSIRECORD *current; + r = join_find_row( wv, rec, &row ); if (r != ERROR_SUCCESS) return r; - return WHERE_set_row( view, row, rec, (1 << wv->col_count) - 1 ); + r = msi_view_get_row( wv->db, view, row, &current ); + if (r != ERROR_SUCCESS) + return r; + + assert(MSI_RecordGetFieldCount(rec) == MSI_RecordGetFieldCount(current)); + + for (i = MSI_RecordGetFieldCount(rec); i > 0; i--) + { + if (!MSI_RecordsAreFieldsEqual(rec, current, i)) + mask |= 1 << (i - 1); + } + msiobj_release(&current->hdr); + + return WHERE_set_row( view, row, rec, mask ); } static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,

1 0

Bernhard Loos : msi: Implement proper sorting in WHEREVIEW.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: f0a53a8f1bde9b8f1be096160f9664415835e29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a53a8f1bde9b8f1be096160… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Aug 26 04:53:44 2011 +0200 msi: Implement proper sorting in WHEREVIEW. --- dlls/msi/where.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 106 insertions(+), 12 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 0742244..16b6c03 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -38,9 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ - typedef struct tagMSIROWENTRY { + struct tagMSIWHEREVIEW *wv; /* used during sorting */ UINT values[1]; } MSIROWENTRY; @@ -53,6 +53,13 @@ typedef struct tagJOINTABLE UINT table_index; } JOINTABLE; +typedef struct tagMSIORDERINFO +{ + UINT col_count; + UINT error; + union ext_column columns[1]; +} MSIORDERINFO; + typedef struct tagMSIWHEREVIEW { MSIVIEW view; @@ -65,6 +72,7 @@ typedef struct tagMSIWHEREVIEW UINT reorder_size; /* number of entries available in reorder */ struct expr *cond; UINT rec_index; + MSIORDERINFO *order_info; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 @@ -136,6 +144,7 @@ static UINT add_row(MSIWHEREVIEW *wv, UINT vals[]) wv->reorder[wv->row_count++] = new; memcpy(new->values, vals, wv->table_count * sizeof(UINT)); + new->wv = wv; return ERROR_SUCCESS; } @@ -549,6 +558,53 @@ static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE *tab return r; } +static int compare_entry( const void *left, const void *right ) +{ + const MSIROWENTRY *le = *(const MSIROWENTRY**)left; + const MSIROWENTRY *re = *(const MSIROWENTRY**)right; + const MSIWHEREVIEW *wv = le->wv; + MSIORDERINFO *order = wv->order_info; + UINT i, j, r, l_val, r_val; + + assert(le->wv == re->wv); + + if (order) + { + for (i = 0; i < order->col_count; i++) + { + const union ext_column *column = &order->columns[i]; + + r = column->parsed.table->view->ops->fetch_int(column->parsed.table->view, + le->values[column->parsed.table->table_index], + column->parsed.column, &l_val); + if (r != ERROR_SUCCESS) + { + order->error = r; + return 0; + } + + r = column->parsed.table->view->ops->fetch_int(column->parsed.table->view, + re->values[column->parsed.table->table_index], + column->parsed.column, &r_val); + if (r != ERROR_SUCCESS) + { + order->error = r; + return 0; + } + + if (l_val != r_val) + return l_val < r_val ? -1 : 1; + } + } + + for (j = 0; j < wv->table_count; j++) + { + if (le->values[j] != re->values[j]) + return le->values[j] < re->values[j] ? -1 : 1; + } + return 0; +} + static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; @@ -583,6 +639,15 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) while ((table = table->next)); r = check_condition(wv, record, wv->tables, rows); + + if (wv->order_info) + wv->order_info->error = ERROR_SUCCESS; + + qsort(wv->reorder, wv->row_count, sizeof(MSIROWENTRY *), compare_entry); + + if (wv->order_info) + r = wv->order_info->error; + return r; } @@ -773,6 +838,12 @@ static UINT WHERE_delete( struct tagMSIVIEW *view ) free_reorder(wv); + if (wv->order_info) + { + msi_free(wv->order_info); + wv->order_info = NULL; + } + msiobj_release( &wv->db->hdr ); msi_free( wv ); @@ -813,22 +884,49 @@ static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns) { MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; JOINTABLE *table = wv->tables; - UINT r; + column_info *column = columns; + MSIORDERINFO *orderinfo; + UINT r, count = 0; + int i; TRACE("%p %p\n", view, columns); if (!table) return ERROR_FUNCTION_FAILED; - do + while (column) { - r = table->view->ops->sort(table->view, columns); + count++; + column = column->next; + } + + if (count == 0) + return ERROR_SUCCESS; + + orderinfo = msi_alloc(sizeof(MSIORDERINFO) + (count - 1) * sizeof(union ext_column)); + if (!orderinfo) + return ERROR_OUTOFMEMORY; + + orderinfo->col_count = count; + + column = columns; + + for (i = 0; i < count; i++) + { + orderinfo->columns[i].unparsed.column = column->column; + orderinfo->columns[i].unparsed.table = column->table; + + r = parse_column(wv, &orderinfo->columns[i], NULL); if (r != ERROR_SUCCESS) - return r; + goto error; } - while ((table = table->next)); + + wv->order_info = orderinfo; return ERROR_SUCCESS; +error: + msi_free(orderinfo); + return r; } static const MSIVIEWOPS where_ops = @@ -949,7 +1047,6 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, MSIWHEREVIEW *wv = NULL; UINT r, valid = 0; WCHAR *ptr; - JOINTABLE **lastnext; TRACE("(%s)\n", debugstr_w(tables) ); @@ -963,8 +1060,6 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, wv->db = db; wv->cond = cond; - lastnext = &wv->tables; - while (*tables) { JOINTABLE *table; @@ -998,10 +1093,9 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, wv->col_count += table->col_count; table->table_index = wv->table_count++; - table->next = NULL; - *lastnext = table; - lastnext = &table->next; + table->next = wv->tables; + wv->tables = table; if (!ptr) break;

1 0

Alexandre Julliard : winecfg: Fix deletion of registry keys for Wow64 mode.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: fdc0d0f95f8a86b73094db15aaca2f861aab50f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc0d0f95f8a86b73094db15a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 14:28:11 2011 +0200 winecfg: Fix deletion of registry keys for Wow64 mode. --- programs/winecfg/winecfg.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 1d2ec50..8a2f534 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -645,7 +645,11 @@ static void process_setting(struct setting *s) { /* NULL name means remove that path/section entirely */ if (s->name) RegDeleteValueW( key, s->name ); - else RegDeleteTreeW( key, NULL ); + else + { + RegDeleteTreeW( key, NULL ); + RegDeleteKeyW( s->root, s->path ); + } RegCloseKey( key ); } if (needs_wow64) @@ -654,7 +658,11 @@ static void process_setting(struct setting *s) if (!RegOpenKeyExW( s->root, s->path, 0, MAXIMUM_ALLOWED | KEY_WOW64_32KEY, &key )) { if (s->name) RegDeleteValueW( key, s->name ); - else RegDeleteTreeW( key, NULL ); + else + { + RegDeleteTreeW( key, NULL ); + RegDeleteKeyExW( s->root, s->path, KEY_WOW64_32KEY, 0 ); + } RegCloseKey( key ); } }

1 0

Jörg Höhle : winealsa: Pulse knows handle_underrun only since 2010-07-09.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 8129b1847a13be248098b8d8ec773f8bdf821df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8129b1847a13be248098b8d8e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 9 21:19:51 2011 +0200 winealsa: Pulse knows handle_underrun only since 2010-07-09. --- dlls/winealsa.drv/mmdevdrv.c | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 01fe4fd..ec75fec 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -497,6 +497,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, int err; snd_pcm_stream_t stream; snd_config_t *lconf; + static int handle_underrun = 1; TRACE("\"%s\" %p %d %p\n", key, dev, dataflow, out); @@ -520,27 +521,23 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, return E_UNEXPECTED; } - lconf = make_handle_underrun_config(key); - This->dataflow = dataflow; - if(lconf){ - if((err = snd_pcm_open_lconf(&This->pcm_handle, key, stream, - SND_PCM_NONBLOCK, lconf)) < 0){ - snd_config_delete(lconf); - HeapFree(GetProcessHeap(), 0, This); - WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, - snd_strerror(err)); - return E_FAIL; - } + if(handle_underrun && ((lconf = make_handle_underrun_config(key)))){ + err = snd_pcm_open_lconf(&This->pcm_handle, key, stream, SND_PCM_NONBLOCK, lconf); + TRACE("Opening PCM device \"%s\" with handle_underrun: %d\n", key, err); snd_config_delete(lconf); - }else{ - if((err = snd_pcm_open(&This->pcm_handle, key, stream, - SND_PCM_NONBLOCK)) < 0){ - HeapFree(GetProcessHeap(), 0, This); - WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, - snd_strerror(err)); - return E_FAIL; - } + /* Pulse <= 2010 returns EINVAL, it does not know handle_underrun. */ + if(err == -EINVAL) + handle_underrun = 0; + }else + err = -EINVAL; + if(err == -EINVAL){ + err = snd_pcm_open(&This->pcm_handle, key, stream, SND_PCM_NONBLOCK); + } + if(err < 0){ + HeapFree(GetProcessHeap(), 0, This); + WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); + return E_FAIL; } This->hw_params = HeapAlloc(GetProcessHeap(), 0,

1 0

Frédéric Delanoy : cmd: Add @drive@ keyword, replaced by drive letter.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 1e89625b11198fe2c0c956a10eebd883fae301b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e89625b11198fe2c0c956a10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 01:19:25 2011 +0200 cmd: Add @drive@ keyword, replaced by drive letter. --- programs/cmd/tests/batch.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index cb3d972..43e2073 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -24,6 +24,8 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; +static char drive[2]; +static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); /* Convert to DOS line endings, and substitute escaped whitespace chars with real ones */ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) @@ -154,6 +156,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const const char *err = NULL; static const char pwd_cmd[] = {'@','p','w','d','@'}; + static const char drive_cmd[] = {'@','d','r','i','v','e','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; @@ -171,6 +174,18 @@ static const char *compare_line(const char *out_line, const char *out_end, const out_ptr += workdir_len; continue; } + } else if(exp_ptr+sizeof(drive_cmd) <= exp_end + && !memcmp(exp_ptr, drive_cmd, sizeof(drive_cmd))) { + exp_ptr += sizeof(drive_cmd); + if(out_end-out_ptr < drive_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, +out_ptr, drive_len, + drive, drive_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += drive_len; + continue; + } }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); @@ -391,6 +406,8 @@ START_TEST(batch) } workdir_len = GetCurrentDirectoryA(sizeof(workdir), workdir); + drive[0] = workdir[0]; + drive[1] = workdir[1]; /* Should be ':' */ argc = winetest_get_mainargs(&argv); if(argc > 2)

1 0

Frédéric Delanoy : cmd: Add @drive@ keyword, replaced by drive letter.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 64ce7c0ede9f24e314a0ed5285091bb69d5e73c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ce7c0ede9f24e314a0ed528… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 01:19:25 2011 +0200 cmd: Add @drive@ keyword, replaced by drive letter. --- programs/cmd/tests/batch.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 43e2073..b3b28c6 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -179,8 +179,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const exp_ptr += sizeof(drive_cmd); if(out_end-out_ptr < drive_len || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, -out_ptr, drive_len, - drive, drive_len) != CSTR_EQUAL)) { + out_ptr, drive_len, drive, drive_len) != CSTR_EQUAL)) { err = out_ptr; }else { out_ptr += drive_len;

1 0

Frédéric Delanoy : cmd: Add @path@ keyword, replaced by regular non-expanded path.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 68e7fcda59ee3d2a2095df3ed63144a5a66b0454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e7fcda59ee3d2a2095df3ed… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 01:19:26 2011 +0200 cmd: Add @path@ keyword, replaced by regular non-expanded path. --- programs/cmd/tests/batch.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index b3b28c6..7c5a204 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -26,6 +26,8 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; static char drive[2]; static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); +static char path[MAX_PATH]; +static DWORD path_len; /* Convert to DOS line endings, and substitute escaped whitespace chars with real ones */ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) @@ -157,6 +159,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char drive_cmd[] = {'@','d','r','i','v','e','@'}; + static const char path_cmd[] = {'@','p','a','t','h','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; @@ -185,6 +188,17 @@ static const char *compare_line(const char *out_line, const char *out_end, const out_ptr += drive_len; continue; } + } else if(exp_ptr+sizeof(path_cmd) <= exp_end + && !memcmp(exp_ptr, path_cmd, sizeof(path_cmd))) { + exp_ptr += sizeof(path_cmd); + if(out_end-out_ptr < path_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + out_ptr, path_len, path, path_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += path_len; + continue; + } }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); @@ -407,6 +421,9 @@ START_TEST(batch) workdir_len = GetCurrentDirectoryA(sizeof(workdir), workdir); drive[0] = workdir[0]; drive[1] = workdir[1]; /* Should be ':' */ + memcpy(path, workdir + drive_len, (workdir_len - drive_len) * sizeof(drive[0])); + path[workdir_len - drive_len] = '\\'; + path_len = workdir_len - drive_len + 1; argc = winetest_get_mainargs(&argv); if(argc > 2)

1 0

Frédéric Delanoy : cmd: Add @shortpath@ keyword, replaced by expanded path with short names.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: c85be8aecc99ceb5bba0712e5ac90f9cec7670ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c85be8aecc99ceb5bba0712e5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 01:19:27 2011 +0200 cmd: Add @shortpath@ keyword, replaced by expanded path with short names. --- programs/cmd/tests/batch.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 7c5a204..58d75c3 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -28,6 +28,8 @@ static char drive[2]; static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); static char path[MAX_PATH]; static DWORD path_len; +static char shortpath[MAX_PATH]; +static DWORD shortpath_len; /* Convert to DOS line endings, and substitute escaped whitespace chars with real ones */ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) @@ -160,6 +162,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char drive_cmd[] = {'@','d','r','i','v','e','@'}; static const char path_cmd[] = {'@','p','a','t','h','@'}; + static const char shortpath_cmd[] = {'@','s','h','o','r','t','p','a','t','h','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; @@ -199,6 +202,17 @@ static const char *compare_line(const char *out_line, const char *out_end, const out_ptr += path_len; continue; } + } else if(exp_ptr+sizeof(shortpath_cmd) <= exp_end + && !memcmp(exp_ptr, shortpath_cmd, sizeof(shortpath_cmd))) { + exp_ptr += sizeof(shortpath_cmd); + if(out_end-out_ptr < shortpath_len + || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + out_ptr, shortpath_len, shortpath, shortpath_len) != CSTR_EQUAL)) { + err = out_ptr; + }else { + out_ptr += shortpath_len; + continue; + } }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); @@ -424,6 +438,8 @@ START_TEST(batch) memcpy(path, workdir + drive_len, (workdir_len - drive_len) * sizeof(drive[0])); path[workdir_len - drive_len] = '\\'; path_len = workdir_len - drive_len + 1; + shortpath_len = GetShortPathNameA(path, shortpath, + sizeof(shortpath)/sizeof(shortpath[0])); argc = winetest_get_mainargs(&argv); if(argc > 2)

1 0

Frédéric Delanoy : cmd/tests: Add variable substitution tests.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 9b79fd5777fcd2058850aa632746089ea7a6576c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b79fd5777fcd2058850aa632… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 01:19:28 2011 +0200 cmd/tests: Add variable substitution tests. --- programs/cmd/tests/test_builtins.cmd | 110 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 62 +++++++++++++++++ 2 files changed, 172 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f5df409..78eea97 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -227,6 +227,116 @@ echo '%VAR:~-2,-4%' echo %VAR:~-3,-2% set VAR= +echo ------------ Testing variable substitution -------------- +echo ...in FOR variables +for %%i in ("A B" C) do echo %%i +rem quotes removal +for %%i in ("A B" C) do echo '%%~i' +rem fully qualified path +for %%f in ("C D" E) do echo %%~ff +rem drive letter +for %%i in ("F G" H) do echo %%~di +rem path +for %%d in ("I J" K) do echo %%~pd +rem filename +for %%i in ("L M" N) do echo %%~ni +rem file extension +for %%i in ("O. P.OOL" Q.TABC hello) do echo '%%~xi' +rem path with short path names +for %%I in ("R S" T ABCDEFGHIJK.LMNOP) do echo '%%~sI' +rem file attribute +for %%i in ("U V" W) do echo '%%~ai' +echo foo> foo +for %%i in (foo) do echo '%%~ai' +del foo +rem file date/time +rem Not fully testable, until we can grep dir's output to get foo's creation time in an envvar... +for %%i in ("a b" c) do echo '%%~ti' +rem file size +rem Similar issues as above +for %%i in ("a b" c) do echo '%%~zi' +rem combined options +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' + +echo ...in parameters +for %%i in ("A B" C) do call :echoFun %%i +rem quotes removal +for %%i in ("A B" C) do call :echoFunQ %%i +rem fully qualified path +for %%f in ("C D" E) do call :echoFunF %%f +rem drive letter +for %%i in ("F G" H) do call :echoFunD %%i +rem path +for %%d in ("I J" K) do call :echoFunP %%d +rem filename +for %%i in ("L M" N) do call :echoFunN %%i +rem file extension +for %%i in ("O. P.OOL" Q.TABC hello) do call :echoFunX %%i +rem path with short path names +for %%I in ("R S" T ABCDEFGHIJK.LMNOP) do call :echoFunS %%I +rem NT4 aborts whole script execution when encountering ~a, ~t and ~z substitutions, preventing full testing +rem combined options +for %%i in ("d e" f) do call :echoFunDP %%i +for %%i in ("g h" i) do call :echoFunSD %%i +for %%i in ("g h" i) do call :echoFunDS %%i +for %%i in ("j k" l.eh) do call :echoFunXS %%i + +goto :endEchoFuns +:echoFun +echo %1 +goto :eof + +:echoFunQ +echo '%~1' +goto :eof + +:echoFunF +echo %~f1 +goto :eof + +:echoFunD +echo %~d1 +goto :eof + +:echoFunP +echo %~p1 +goto :eof + +:echoFunN +echo %~n1 +goto :eof + +:echoFunX +echo '%~x1' +goto :eof + +:echoFunS +rem some NT4 workaround +set VAR='%~s1' +echo %VAR% +set VAR= +goto :eof + +:echoFunDP +echo %~dp1 +goto :eof + +:echoFunSD +echo %~sd1 +goto :eof + +:echoFunDS +echo %~ds1 +goto :eof + +:echoFunXS +echo '%~xs1' +goto :eof +:endEchoFuns + echo ------------ Testing variable delayed expansion -------------- rem NT4 doesn't support this echo ...default mode (load-time expansion) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 04e04a7..85afd34 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -213,6 +213,68 @@ ert(a)or_broken@qwerty e(a)or_broken@qwerty ''@or_broken@'qwerty' r(a)or_broken@qwerty +------------ Testing variable substitution -------------- +...in FOR variables +(a)todo_wine@"A B" +C +'A B'@or_broken@'' +'C'@or_broken@'' +(a)pwd@\C D(a)or_broken@%~ff +(a)pwd@\E(a)or_broken@%~ff +(a)drive@ +(a)drive@ +(a)path@@or_broken@%~pd +(a)path@@or_broken@%~pd +L M +N +'.OOL' +'.TABC' +'' +(a)todo_wine@'@drive@@shortpath(a)R S'@or_broken@'' +(a)todo_wine@'@drive@@shortpath(a)T'@or_broken@'' +(a)todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' +(a)todo_wine@''@or_broken@'%~ai' +(a)todo_wine@''@or_broken@'%~ai' +(a)todo_wine@'--a------'@or_broken@'%~ai' +(a)todo_wine@''@or_broken@'%~ti' +(a)todo_wine@''@or_broken@'%~ti' +(a)todo_wine@''@or_broken@'%~zi' +(a)todo_wine@''@or_broken@'%~zi' +(a)drive@@path@ +(a)drive@@path@ +(a)drive@ +(a)drive@ +(a)drive@ +(a)drive@ +'' +'.eh' +...in parameters +(a)todo_wine@"A B" +C +(a)todo_wine@'A B'@or_broken@'' +'C'@or_broken@'' +(a)todo_wine@@pwd@\C D +(a)pwd@\E +(a)drive@ +(a)drive@ +(a)path@ +(a)path@ +(a)todo_wine@L M +N +(a)todo_wine@'.OOL' +'.TABC' +'' +(a)todo_wine@'@drive@@shortpath(a)R S'@or_broken@'' +(a)todo_wine@'@drive@@shortpath(a)T'@or_broken@'' +(a)todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' +(a)drive@@path@ +(a)drive@@path@ +(a)drive@ +(a)drive@ +(a)drive@ +(a)drive@ +'' +'.eh'@or_broken@'' ------------ Testing variable delayed expansion -------------- ...default mode (load-time expansion) foo

1 0