wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Nikolay Sivov : msxml3: Fix parameter validation for endElement().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 058136041121b29b35119117a7e62d2eeef17625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058136041121b29b35119117a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 15:32:27 2011 +0400 msxml3: Fix parameter validation for endElement(). --- dlls/msxml3/mxwriter.c | 3 +- dlls/msxml3/tests/saxreader.c | 126 ++++++++++++++++++++++++++++------------ 2 files changed, 90 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=058136041121b29b35119…

1 0

Nikolay Sivov : msxml3: Fix parameter validation for startElement() for MXXMLWriter60.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 25bf8e5387873d8a002d01c454c3af4f14589036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf8e5387873d8a002d01c45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 15:31:02 2011 +0400 msxml3: Fix parameter validation for startElement() for MXXMLWriter60. --- dlls/msxml3/mxwriter.c | 3 +- dlls/msxml3/tests/saxreader.c | 177 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 164 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 60ac35f..0ac5974 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -737,7 +737,8 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); - if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; + if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) + return E_INVALIDARG; xmlOutputBufferWriteString(This->buffer, "<"); s = xmlchar_from_wchar(QName); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e136e33..ca70a0d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -32,6 +32,9 @@ #include "wine/test.h" +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -1377,6 +1380,163 @@ static void test_mxwriter_startenddocument(void) free_bstrs(); } +struct writer_startelement_t { + const GUID *clsid; + const char *uri; + const char *local_name; + const char *qname; + const char *output; + HRESULT hr; +}; + +static const struct writer_startelement_t writer_startelement[] = { + /* 0 */ + { &CLSID_MXXMLWriter, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, NULL, NULL, NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, "uri", NULL, NULL, NULL, E_INVALIDARG }, + /* 5 */ + { &CLSID_MXXMLWriter30, "uri", NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, "uri", NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, "uri", NULL, NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, NULL, "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, NULL, "local", NULL, NULL, E_INVALIDARG }, + /* 10 */ + { &CLSID_MXXMLWriter40, NULL, "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, NULL, "local", NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, NULL, NULL, "qname", NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, NULL, NULL, "qname", NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, NULL, NULL, "qname", NULL, E_INVALIDARG }, + /* 15 */ + { &CLSID_MXXMLWriter60, NULL, NULL, "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter, "uri", "local", "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter30, "uri", "local", "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter40, "uri", "local", "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter60, "uri", "local", "qname", "<qname>", S_OK }, + /* 20 */ + { &CLSID_MXXMLWriter, "uri", "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, "uri", "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, "uri", "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, "uri", "local", NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, "uri", "local", "uri:local", "<uri:local>", S_OK }, + /* 25 */ + { &CLSID_MXXMLWriter30, "uri", "local", "uri:local", "<uri:local>", S_OK }, + { &CLSID_MXXMLWriter40, "uri", "local", "uri:local", "<uri:local>", S_OK }, + { &CLSID_MXXMLWriter60, "uri", "local", "uri:local", "<uri:local>", S_OK }, + { &CLSID_MXXMLWriter, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + { &CLSID_MXXMLWriter30, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + /* 30 */ + { &CLSID_MXXMLWriter40, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + { &CLSID_MXXMLWriter60, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + { NULL } +}; + +struct msxmlsupported_data_t +{ + const GUID *clsid; + const char *name; + BOOL supported; +}; + +static struct msxmlsupported_data_t msxmlsupported_data[] = +{ + { &CLSID_MXXMLWriter, "MXXMLWriter" }, + { &CLSID_MXXMLWriter30, "MXXMLWriter30" }, + { &CLSID_MXXMLWriter40, "MXXMLWriter40" }, + { &CLSID_MXXMLWriter60, "MXXMLWriter60" }, + { NULL } +}; + +static void get_supported_mxwriter_data(struct msxmlsupported_data_t *table) +{ + while (table->clsid) + { + IMXWriter *writer; + HRESULT hr; + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + if (hr == S_OK) IMXWriter_Release(writer); + + table->supported = hr == S_OK; + if (hr != S_OK) win_skip("class %s not supported\n", table->name); + + table++; + } +} + +static BOOL is_mxwriter_supported(const GUID *clsid, const struct msxmlsupported_data_t *table) +{ + while (table->clsid) + { + if (table->clsid == clsid) return table->supported; + table++; + } + return FALSE; +} + +static void test_mxwriter_startelement(const struct writer_startelement_t *table) +{ + int i; + + get_supported_mxwriter_data(msxmlsupported_data); + + i = 0; + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_mxwriter_supported(table->clsid, msxmlsupported_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), + _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), NULL); + ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + table++; + i++; + } + + free_bstrs(); +} + static void test_mxwriter_startendelement(void) { static const char winehqA[] = "http://winehq.org"; @@ -1385,6 +1545,8 @@ static void test_mxwriter_startendelement(void) VARIANT dest; HRESULT hr; + test_mxwriter_startelement(writer_startelement); + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1398,21 +1560,6 @@ static void test_mxwriter_startendelement(void) hr = ISAXContentHandler_startDocument(content); ok(hr == S_OK, "got %08x\n", hr); - /* qualified name without defined namespace */ - hr = ISAXContentHandler_startElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - - hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - - /* only local name is an error too */ - hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - - /* only local name is an error too */ - hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - /* all string pointers should be not null */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, _bstr_(""), 0, NULL); ok(hr == S_OK, "got %08x\n", hr);

1 0

Bernhard Loos : msi: Use an array instead of a hashtable for WHEREVIEW.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 3bd0acf1ba233ff7deb370c7f198a71e29b15799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd0acf1ba233ff7deb370c7f… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Aug 24 16:42:53 2011 +0200 msi: Use an array instead of a hashtable for WHEREVIEW. --- dlls/msi/where.c | 150 ++++++++++++++++++++++++------------------------------ 1 files changed, 67 insertions(+), 83 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index ae31e81..c29c883 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -36,14 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -#define MSI_HASH_TABLE_SIZE 37 - -typedef struct tagMSIHASHENTRY +typedef struct tagMSIROWENTRY { - struct tagMSIHASHENTRY *next; UINT value; - UINT row; -} MSIHASHENTRY; +} MSIROWENTRY; /* below is the query interface to a table */ @@ -53,73 +49,84 @@ typedef struct tagMSIWHEREVIEW MSIDATABASE *db; MSIVIEW *table; UINT row_count; - MSIHASHENTRY **reorder; + MSIROWENTRY **reorder; + UINT reorder_size; /* number of entries available in reorder */ struct expr *cond; UINT rec_index; } MSIWHEREVIEW; -static void free_hash_table(MSIHASHENTRY **table) -{ - MSIHASHENTRY *new, *old; - int i; - - if (!table) - return; +#define INITIAL_REORDER_SIZE 16 - for (i = 0; i < MSI_HASH_TABLE_SIZE; i++) - { - new = table[i]; +static UINT init_reorder(MSIWHEREVIEW *wv) +{ + MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); + if (!new) + return ERROR_OUTOFMEMORY; - while (new) - { - old = new; - new = old->next; - msi_free(old); - } + if (wv->reorder) + msi_free(wv->reorder); - table[i] = NULL; - } + wv->reorder = new; + wv->reorder_size = INITIAL_REORDER_SIZE; + wv->row_count = 0; - msi_free(table); + return ERROR_SUCCESS; } -static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) +static void free_reorder(MSIWHEREVIEW *wv) { - MSIHASHENTRY *entry; + UINT i; - if (!table) - return ERROR_SUCCESS; + if (!wv->reorder) + return; + + for (i = 0; i < wv->row_count; i++) + msi_free(wv->reorder[i]); + + msi_free( wv->reorder ); + wv->reorder = NULL; + wv->reorder_size = 0; + wv->row_count = 0; +} - if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) +static inline UINT find_row(MSIWHEREVIEW *wv, UINT row, UINT *value) +{ + if (row >= wv->row_count) { - WARN("Row not found in hash table!\n"); - return ERROR_FUNCTION_FAILED; + *value = -2; + return ERROR_NO_MORE_ITEMS; } - while (entry && entry->row != row) - entry = entry->next; + *value = wv->reorder[row]->value; - if (entry) *val = entry->value; return ERROR_SUCCESS; } -static UINT add_entry_to_hash(MSIHASHENTRY **table, UINT row, UINT val) +static UINT add_row(MSIWHEREVIEW *wv, UINT val) { - MSIHASHENTRY *new = msi_alloc(sizeof(MSIHASHENTRY)); - MSIHASHENTRY *prev; + MSIROWENTRY *new; + + if (wv->reorder_size <= wv->row_count) + { + MSIROWENTRY **new_reorder; + UINT newsize = wv->reorder_size * 2; + + new_reorder = msi_realloc_zero(wv->reorder, sizeof(MSIROWENTRY *) * newsize); + if (!new_reorder) + return ERROR_OUTOFMEMORY; + + wv->reorder = new_reorder; + wv->reorder_size = newsize; + } + + new = msi_alloc(sizeof(MSIROWENTRY)); if (!new) return ERROR_OUTOFMEMORY; - new->next = NULL; - new->value = val; - new->row = row; + wv->reorder[wv->row_count++] = new; - prev = table[row % MSI_HASH_TABLE_SIZE]; - if (prev) - new->next = prev; - - table[row % MSI_HASH_TABLE_SIZE] = new; + new->value = val; return ERROR_SUCCESS; } @@ -134,10 +141,7 @@ static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * if( !wv->table ) return ERROR_FUNCTION_FAILED; - if( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -154,10 +158,7 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt if( !wv->table ) return ERROR_FUNCTION_FAILED; - if( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -174,10 +175,7 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) if (!wv->table) return ERROR_FUNCTION_FAILED; - if (row > wv->row_count) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -194,10 +192,7 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if( !wv->table ) return ERROR_FUNCTION_FAILED; - if( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -214,10 +209,7 @@ static UINT WHERE_delete_row(struct tagMSIVIEW *view, UINT row) if ( !wv->table ) return ERROR_FUNCTION_FAILED; - if ( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash( wv->reorder, row, &row ); + r = find_row( wv, row, &row ); if ( r != ERROR_SUCCESS ) return r; @@ -396,12 +388,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( r != ERROR_SUCCESS ) return r; - free_hash_table(wv->reorder); - wv->reorder = msi_alloc_zero(MSI_HASH_TABLE_SIZE * sizeof(MSIHASHENTRY *)); - if( !wv->reorder ) - return ERROR_OUTOFMEMORY; - - wv->row_count = 0; + r = init_reorder(wv); + if( r != ERROR_SUCCESS ) + return r; if (0) /* disable optimization, there's no guarantee that strings are in the string table */ { @@ -439,7 +428,7 @@ if (0) /* disable optimization, there's no guarantee that strings are in the str { r = table->ops->find_matching_rows(table, col, value, &row, &handle); if (r == ERROR_SUCCESS) - add_entry_to_hash(wv->reorder, wv->row_count++, row); + add_row(wv, row); } while (r == ERROR_SUCCESS); if (r == ERROR_NO_MORE_ITEMS) @@ -459,7 +448,7 @@ if (0) /* disable optimization, there's no guarantee that strings are in the str if( r != ERROR_SUCCESS ) return r; if( val ) - add_entry_to_hash( wv->reorder, wv->row_count++, i ); + add_row( wv, i ); } return ERROR_SUCCESS; @@ -517,7 +506,7 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, TRACE("%p %d %p\n", wv, eModifyMode, rec); - find_entry_in_hash(wv->reorder, row - 1, &row); + find_row(wv, row - 1, &row); row++; return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); @@ -533,9 +522,7 @@ static UINT WHERE_delete( struct tagMSIVIEW *view ) wv->table->ops->delete( wv->table ); wv->table = 0; - free_hash_table(wv->reorder); - wv->reorder = NULL; - wv->row_count = 0; + free_reorder(wv); msiobj_release( &wv->db->hdr ); msi_free( wv ); @@ -558,10 +545,7 @@ static UINT WHERE_find_matching_rows( struct tagMSIVIEW *view, UINT col, if (r != ERROR_SUCCESS) return r; - if( *row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - return find_entry_in_hash(wv->reorder, *row, row); + return find_row(wv, *row, row); } static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns)

1 0

Michał Ziętek : wscript: Implemented Host_get_Application.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 559547f21e01b19fa784739074f8b9db1823167f URL: http://source.winehq.org/git/wine.git/?a=commit;h=559547f21e01b19fa78473907… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:19 2011 +0200 wscript: Implemented Host_get_Application. --- programs/wscript/host.c | 6 ++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 82209ea..b7b94a2 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -110,8 +110,10 @@ static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name) static HRESULT WINAPI Host_get_Application(IHost *iface, IDispatch **out_Dispatch) { - WINE_FIXME("(%p)\n", out_Dispatch); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Dispatch); + + *out_Dispatch = (IDispatch*)&host_obj; + return S_OK; } static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index d487166..8c75d0a 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -47,5 +47,6 @@ WScript.Interactive = false; ok(WScript.Interactive === false, "WScript.Interactive = " + WScript.Interactive); WScript.Interactive = true; ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); +ok(WScript.Application === WScript, "WScript.Application = " + WScript.Application); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Host_put_Interactive.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 154578d75cad1a7948ffda54c513850f189704cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=154578d75cad1a7948ffda54c… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:15 2011 +0200 wscript: Implemented Host_put_Interactive. --- programs/wscript/host.c | 6 ++++-- programs/wscript/tests/run.js | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 0ce7e58..82209ea 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -154,8 +154,10 @@ static HRESULT WINAPI Host_get_Interactive(IHost *iface, VARIANT_BOOL *out_Inter static HRESULT WINAPI Host_put_Interactive(IHost *iface, VARIANT_BOOL v) { - WINE_FIXME("(%x)\n", v); - return E_NOTIMPL; + WINE_TRACE("(%x)\n", v); + + wshInteractive = v; + return S_OK; } static HRESULT WINAPI Host_Quit(IHost *iface, int ExitCode) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 6773df5..d487166 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -43,5 +43,9 @@ try { ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); +WScript.Interactive = false; +ok(WScript.Interactive === false, "WScript.Interactive = " + WScript.Interactive); +WScript.Interactive = true; +ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Host_get_Interactive.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 280dbcf84a314ff111306f85432df60bd65effff URL: http://source.winehq.org/git/wine.git/?a=commit;h=280dbcf84a314ff111306f854… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:08 2011 +0200 wscript: Implemented Host_get_Interactive. --- programs/wscript/host.c | 7 +++++-- programs/wscript/main.c | 25 ++++++++++++++++++++++++- programs/wscript/tests/run.js | 1 + programs/wscript/wscript.h | 2 ++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 02a9291..0ce7e58 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -34,6 +34,7 @@ static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; +VARIANT_BOOL wshInteractive = VARIANT_TRUE; WINE_DEFAULT_DEBUG_CHANNEL(wscript); @@ -145,8 +146,10 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) static HRESULT WINAPI Host_get_Interactive(IHost *iface, VARIANT_BOOL *out_Interactive) { - WINE_FIXME("(%p)\n", out_Interactive); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Interactive); + + *out_Interactive = wshInteractive; + return S_OK; } static HRESULT WINAPI Host_put_Interactive(IHost *iface, VARIANT_BOOL v) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3073445..9d79415 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -322,6 +322,28 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri WINE_FIXME("SetScriptState failed: %08x\n", hres); } +static BOOL set_host_properties(const WCHAR *prop) +{ + static const WCHAR iactive[] = {'i',0}; + static const WCHAR batch[] = {'b',0}; + + if(*prop == '/') { + ++prop; + if(*prop == '/') + ++prop; + } + else + ++prop; + + if(strcmpiW(prop, iactive) == 0) + wshInteractive = VARIANT_TRUE; + else if(strcmpiW(prop, batch) == 0) + wshInteractive = VARIANT_FALSE; + else + return FALSE; + return TRUE; +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { const WCHAR *ext, *filename = NULL; @@ -340,7 +362,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm for(i=0; i<argc; i++) { if(*argv[i] == '/' || *argv[i] == '-') { - WINE_FIXME("Unsupported argument %s\n", wine_dbgstr_w(argv[i])); + if(!set_host_properties(argv[i])) + return 1; }else { filename = argv[i]; argums = argv+i+1; diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 430dfb6..6773df5 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -42,5 +42,6 @@ try { }catch(e) {} ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); +ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 3c9191f..d624a2d 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -31,3 +31,5 @@ extern WCHAR scriptFullName[]; extern WCHAR **argums; extern int numOfArgs; + +extern VARIANT_BOOL wshInteractive;

1 0

Michał Ziętek : wscript: Implemented Arguments2_get_length.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 4252bd8653424b3ad84e7651c1300cc9dbc19b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4252bd8653424b3ad84e7651c… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:03 2011 +0200 wscript: Implemented Arguments2_get_length. --- programs/wscript/arguments.c | 6 ++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index b50ed94..7961948 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -118,8 +118,10 @@ static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) { - WINE_FIXME("(%p)\n", out_Count); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Count); + + *out_Count = numOfArgs; + return S_OK; } static const IArguments2Vtbl Arguments2Vtbl = { diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index dde3caf..430dfb6 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -41,5 +41,6 @@ try { ok(false, "expected exception"); }catch(e) {} ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); +ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Arguments2_Count.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 5079fe98392813db7d59be560a156063059495b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5079fe98392813db7d59be560… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:15:58 2011 +0200 wscript: Implemented Arguments2_Count. --- programs/wscript/arguments.c | 6 ++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index 62d6ad0..b50ed94 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -110,8 +110,10 @@ static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_ static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) { - WINE_FIXME("(%p)\n", out_Count); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Count); + + *out_Count = numOfArgs; + return S_OK; } static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 4b6014e..dde3caf 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -40,5 +40,6 @@ try { WScript.Arguments.Item(3); ok(false, "expected exception"); }catch(e) {} +ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Arguments2_Item.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 1c293750313d9f6a173de8c21a02e6045d61ef57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c293750313d9f6a173de8c21… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:15:54 2011 +0200 wscript: Implemented Arguments2_Item. --- programs/wscript/arguments.c | 13 +++++++++++-- programs/wscript/main.c | 2 ++ programs/wscript/tests/run.c | 2 +- programs/wscript/tests/run.js | 7 +++++++ programs/wscript/wscript.h | 4 ++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index 4b10d2f..62d6ad0 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); +WCHAR **argums; +int numOfArgs; + static HRESULT WINAPI Arguments2_QueryInterface(IArguments2 *iface, REFIID riid, void **ppv) { WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); @@ -95,8 +98,14 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value) { - WINE_FIXME("(%d %p)\n", index, out_Value); - return E_NOTIMPL; + WINE_TRACE("(%d %p)\n", index, out_Value); + + if(index<0 || index >= numOfArgs) + return E_INVALIDARG; + if(!(*out_Value = SysAllocString(argums[index]))) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 2f9b15c..3073445 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -343,6 +343,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("Unsupported argument %s\n", wine_dbgstr_w(argv[i])); }else { filename = argv[i]; + argums = argv+i+1; + numOfArgs = argc-i-1; break; } } diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 7d43d66..b7d3c3c 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -336,7 +336,7 @@ static void run_test(const char *file_name) BOOL bres; script_name = file_name; - sprintf(command, "wscript.exe %s", file_name); + sprintf(command, "wscript.exe %s arg1 2 ar3", file_name); SET_EXPECT(reportSuccess); diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index e1c9da8..4b6014e 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -33,5 +33,12 @@ ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); ok(typeof(WScript.Arguments) === "object", "typeof(WScript.Arguments) = " + typeof(WScript.Arguments)); +ok(WScript.Arguments.Item(0) === "arg1", "WScript.Arguments.Item(0) = " + WScript.Arguments.Item(0)); +ok(WScript.Arguments.Item(1) === "2", "WScript.Arguments.Item(1) = " + WScript.Arguments.Item(1)); +ok(WScript.Arguments.Item(2) === "ar3", "WScript.Arguments.Item(2) = " + WScript.Arguments.Item(2)); +try { + WScript.Arguments.Item(3); + ok(false, "expected exception"); +}catch(e) {} winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index c4b2eb2..3c9191f 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -27,3 +27,7 @@ extern ITypeInfo *host_ti; extern ITypeInfo *arguments_ti; extern WCHAR scriptFullName[]; + +extern WCHAR **argums; + +extern int numOfArgs;

1 0

Michał Ziętek : wscript: Implemented Host_get_Arguments.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 2d2a91fd0183c7d2b751cee2251d0e9b67c85161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2a91fd0183c7d2b751cee22… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:15:48 2011 +0200 wscript: Implemented Host_get_Arguments. --- programs/wscript/Makefile.in | 1 + programs/wscript/arguments.c | 127 +++++++++++++++++++++++++++++++++++++++++ programs/wscript/host.c | 6 +- programs/wscript/main.c | 3 + programs/wscript/tests/run.js | 1 + programs/wscript/wscript.h | 4 + 6 files changed, 140 insertions(+), 2 deletions(-) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 65fe3a4..49836b9 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -7,6 +7,7 @@ RC_SRCS = \ rsrc.rc C_SRCS = \ + arguments.c \ host.c \ main.c diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c new file mode 100644 index 0000000..4b10d2f --- /dev/null +++ b/programs/wscript/arguments.c @@ -0,0 +1,127 @@ +/* + * Copyright 2011 Michal Zietek + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> + +#include "wscript.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + +static HRESULT WINAPI Arguments2_QueryInterface(IArguments2 *iface, REFIID riid, void **ppv) +{ + WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IDispatch, riid) + || IsEqualGUID(&IID_IArguments2, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Arguments2_AddRef(IArguments2 *iface) +{ + return 2; +} + +static ULONG WINAPI Arguments2_Release(IArguments2 *iface) +{ + return 1; +} + +static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pctinfo) +{ + WINE_TRACE("(%p)\n", pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + + ITypeInfo_AddRef(arguments_ti); + *ppTInfo = arguments_ti; + return S_OK; +} + +static HRESULT WINAPI Arguments2_GetIDsOfNames(IArguments2 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(arguments_ti, rgszNames, cNames, rgDispId); +} + +static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + + return ITypeInfo_Invoke(arguments_ti, iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value) +{ + WINE_FIXME("(%d %p)\n", index, out_Value); + return E_NOTIMPL; +} + +static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) +{ + WINE_FIXME("(%p)\n", out_Count); + return E_NOTIMPL; +} + +static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) +{ + WINE_FIXME("(%p)\n", out_Count); + return E_NOTIMPL; +} + +static const IArguments2Vtbl Arguments2Vtbl = { + Arguments2_QueryInterface, + Arguments2_AddRef, + Arguments2_Release, + Arguments2_GetTypeInfoCount, + Arguments2_GetTypeInfo, + Arguments2_GetIDsOfNames, + Arguments2_Invoke, + Arguments2_Item, + Arguments2_Count, + Arguments2_get_length +}; + +IArguments2 arguments_obj = { &Arguments2Vtbl }; diff --git a/programs/wscript/host.c b/programs/wscript/host.c index d17e4b4..02a9291 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -185,8 +185,10 @@ static HRESULT WINAPI Host_get_ScriptFullName(IHost *iface, BSTR *out_ScriptFull static HRESULT WINAPI Host_get_Arguments(IHost *iface, IArguments2 **out_Arguments) { - WINE_FIXME("(%p)\n", out_Arguments); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Arguments); + + *out_Arguments = &arguments_obj; + return S_OK; } static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 8bf0712..2f9b15c 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -39,6 +39,7 @@ static const WCHAR wshW[] = {'W','S','H',0}; WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; +ITypeInfo *arguments_ti; static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) @@ -166,6 +167,8 @@ static BOOL load_typelib(void) return FALSE; hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHost, &host_ti); + if(SUCCEEDED(hres)) + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IArguments2, &arguments_ti); ITypeLib_Release(typelib); return SUCCEEDED(hres); diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 5e61d69..e1c9da8 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -32,5 +32,6 @@ ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); +ok(typeof(WScript.Arguments) === "object", "typeof(WScript.Arguments) = " + typeof(WScript.Arguments)); winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 642784e..c4b2eb2 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -20,6 +20,10 @@ extern IHost host_obj; +extern IArguments2 arguments_obj; + extern ITypeInfo *host_ti; +extern ITypeInfo *arguments_ti; + extern WCHAR scriptFullName[];

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011