October 2008 - Wine-Commits

Jacek Caban : jscript: Added Infinity value implementation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 9a7265beccfc385ed133bcd9afaff3befcb4640c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7265beccfc385ed133bcd9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 14:31:18 2008 -0500 jscript: Added Infinity value implementation. --- dlls/jscript/global.c | 15 +++++++++++++-- dlls/jscript/jscript.h | 12 ++++++++++++ dlls/jscript/tests/lang.js | 9 +++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 39055fa..ae9cc5b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -126,8 +126,19 @@ static HRESULT JSGlobal_NaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT JSGlobal_Infinity(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + num_set_inf(retv, TRUE); + break; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT JSGlobal_Array(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 88bbb8d..59e2353 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -252,6 +252,18 @@ static inline void num_set_nan(VARIANT *v) #endif } +static inline void num_set_inf(VARIANT *v, BOOL positive) +{ + V_VT(v) = VT_R8; +#ifdef INFINITY + V_R8(v) = positive ? INFINITY : -INFINITY; +#else + V_UI8(v) = (ULONGLONG)0x7ff00000<<32; + if(!positive) + V_R8(v) = -V_R8(v); +#endif +} + const char *debugstr_variant(const VARIANT*); HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5d53320..bbafb6e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -787,9 +787,18 @@ if (true) ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); +ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false"); ok(isNaN() === true, "isNaN() !== true"); ok(isNaN(NaN, 0) === true, "isNaN(NaN, 0) !== true"); ok(isNaN(0.5, NaN) === false, "isNaN(0.5, NaN) !== false"); ok(isNaN(+undefined) === true, "isNaN(+undefined) !== true"); +ok(isFinite(0.5) === true, "isFinite(0.5) !== true"); +ok(isFinite(Infinity) === false, "isFinite(Infinity) !== fals"); +ok(isFinite(-Infinity) === false, "isFinite(Infinity) !== fals"); +ok(isFinite(NaN) === false, "isFinite(NaN) !== false"); +ok(isFinite(0.5, NaN) === true, "isFinite(0.5, NaN) !== true"); +ok(isFinite(NaN, 0.5) === false, "isFinite(NaN, 0.5) !== false"); +ok(isFinite() === false, "isFinite() !== false"); + reportSuccess();

1 0

Jacek Caban : jscript: Added NaN handling to relational operators.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 4f6f8ef2d8a196e565488daa96198835ac6df40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6f8ef2d8a196e565488daa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 14:31:30 2008 -0500 jscript: Added NaN handling to relational operators. --- dlls/jscript/engine.c | 31 +++++++++++++++++++------------ dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9c53951..815d5fd 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h" @@ -2599,7 +2602,7 @@ HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f } /* ECMA-262 3rd Edition 11.8.5 */ -static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret) +static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, BOOL greater, jsexcept_t *ei, BOOL *ret) { VARIANT l, r, ln, rn; HRESULT hres; @@ -2615,7 +2618,7 @@ static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept } if(V_VT(&l) == VT_BSTR && V_VT(&r) == VT_BSTR) { - *ret = strcmpW(V_BSTR(&l), V_BSTR(&r)) < 0; + *ret = (strcmpW(V_BSTR(&l), V_BSTR(&r)) < 0) ^ greater; SysFreeString(V_BSTR(&l)); SysFreeString(V_BSTR(&r)); return S_OK; @@ -2629,10 +2632,14 @@ static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept if(FAILED(hres)) return hres; - if(V_VT(&ln) == VT_I4 && V_VT(&rn) == VT_I4) - *ret = V_I4(&ln) < V_I4(&rn); - else - *ret = num_val(&ln) < num_val(&rn); + if(V_VT(&ln) == VT_I4 && V_VT(&rn) == VT_I4) { + *ret = (V_I4(&ln) < V_I4(&rn)) ^ greater; + }else { + DOUBLE ld = num_val(&ln); + DOUBLE rd = num_val(&rn); + + *ret = !isnan(ld) && !isnan(rd) && ((ld < rd) ^ greater); + } return S_OK; } @@ -2651,7 +2658,7 @@ HRESULT less_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, if(FAILED(hres)) return hres; - hres = less_eval(ctx, &lval, &rval, ei, &b); + hres = less_eval(ctx, &lval, &rval, FALSE, ei, &b); VariantClear(&lval); VariantClear(&rval); if(FAILED(hres)) @@ -2674,13 +2681,13 @@ HRESULT lesseq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags if(FAILED(hres)) return hres; - hres = less_eval(ctx, &rval, &lval, ei, &b); + hres = less_eval(ctx, &rval, &lval, TRUE, ei, &b); VariantClear(&lval); VariantClear(&rval); if(FAILED(hres)) return hres; - return return_bool(ret, !b); + return return_bool(ret, b); } /* ECMA-262 3rd Edition 11.8.2 */ @@ -2697,7 +2704,7 @@ HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag if(FAILED(hres)) return hres; - hres = less_eval(ctx, &rval, &lval, ei, &b); + hres = less_eval(ctx, &rval, &lval, FALSE, ei, &b); VariantClear(&lval); VariantClear(&rval); if(FAILED(hres)) @@ -2720,13 +2727,13 @@ HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl if(FAILED(hres)) return hres; - hres = less_eval(ctx, &lval, &rval, ei, &b); + hres = less_eval(ctx, &lval, &rval, TRUE, ei, &b); VariantClear(&lval); VariantClear(&rval); if(FAILED(hres)) return hres; - return return_bool(ret, !b); + return return_bool(ret, b); } /* ECMA-262 3rd Edition 11.4.8 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bbafb6e..2b92d68 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -801,4 +801,16 @@ ok(isFinite(0.5, NaN) === true, "isFinite(0.5, NaN) !== true"); ok(isFinite(NaN, 0.5) === false, "isFinite(NaN, 0.5) !== false"); ok(isFinite() === false, "isFinite() !== false"); +ok((1 < NaN) === false, "(1 < NaN) !== false"); +ok((1 > NaN) === false, "(1 > NaN) !== false"); +ok((1 <= NaN) === false, "(1 <= NaN) !== false"); +ok((1 >= NaN) === false, "(1 >= NaN) !== false"); +ok((NaN < 1) === false, "(NaN < 1) !== false"); +ok((NaN > 1) === false, "(NaN > 1) !== false"); +ok((NaN <= 1) === false, "(NaN <= 1) !== false"); +ok((NaN >= 1) === false, "(NaN >= 1) !== false"); +ok((Infinity < 2) === false, "(Infinity < 2) !== false"); +ok((Infinity > 2) === true, "(Infinity > 2) !== true"); +ok((-Infinity < 2) === true, "(-Infinity < 2) !== true"); + reportSuccess();

1 0

James Hawkins : msi: All files are uncompressed in an administrative image.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: f80b5f6e6624414d8787957938f065bf1a3662e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80b5f6e6624414d878795793… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 16 22:55:21 2008 -0500 msi: All files are uncompressed in an administrative image. --- dlls/msi/action.c | 8 +++- dlls/msi/tests/install.c | 88 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7f73eaa..0c57417 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1481,8 +1481,12 @@ static UINT load_file(MSIRECORD *row, LPVOID param) /* if the compressed bits are not set in the file attributes, * then read the information from the package word count property */ - if (file->Attributes & - (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) + if (package->WordCount & msidbSumInfoSourceTypeAdminImage) + { + file->IsCompressed = FALSE; + } + else if (file->Attributes & + (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) { file->IsCompressed = TRUE; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7f40e32..8d04ff6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -768,6 +768,17 @@ static const CHAR mcomp_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVers "lithium\tlithium\tlithium\t0\t\t\t8192\t1\n" "beryllium\tmissingcomp\tberyllium\t0\t\t\t8192\t1"; +static const CHAR ai_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "five.txt\tFive\tfive.txt\t1000\t\t\t16384\t5\n" + "four.txt\tFour\tfour.txt\t1000\t\t\t16384\t4\n" + "one.txt\tOne\tone.txt\t1000\t\t\t16384\t1\n" + "three.txt\tThree\tthree.txt\t1000\t\t\t16384\t3\n" + "two.txt\tTwo\ttwo.txt\t1000\t\t\t16384\t2\n" + "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" + "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + typedef struct _msi_table { const CHAR *filename; @@ -1166,6 +1177,18 @@ static const msi_table mcomp_tables[] = ADD_TABLE(property), }; +static const msi_table ai_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(ai_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1552,7 +1575,7 @@ static void write_file(const CHAR *filename, const char *data, int data_size) CloseHandle(hf); } -static void write_msi_summary_info(MSIHANDLE db) +static void write_msi_summary_info(MSIHANDLE db, INT wordcount) { MSIHANDLE summary; UINT r; @@ -1570,7 +1593,7 @@ static void write_msi_summary_info(MSIHANDLE db) r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, 100, NULL, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, 0, NULL, NULL); + r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); @@ -1583,7 +1606,11 @@ static void write_msi_summary_info(MSIHANDLE db) MsiCloseHandle(summary); } -static void create_database(const CHAR *name, const msi_table *tables, int num_tables) +#define create_database(name, tables, num_tables) \ + create_database_wordcount(name, tables, num_tables, 0); + +static void create_database_wordcount(const CHAR *name, const msi_table *tables, + int num_tables, INT wordcount) { MSIHANDLE db; UINT r; @@ -1605,7 +1632,7 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t DeleteFileA(table->filename); } - write_msi_summary_info(db); + write_msi_summary_info(db, wordcount); r = MsiDatabaseCommit(db); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5474,6 +5501,58 @@ static void test_sourcedirprop(void) RemoveDirectory("altsource"); } +static void test_adminimage(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + CreateDirectoryA("msitest\\first", NULL); + CreateDirectoryA("msitest\\second", NULL); + CreateDirectoryA("msitest\\cabout", NULL); + CreateDirectoryA("msitest\\cabout\\new", NULL); + create_file("msitest\\one.txt", 100); + create_file("msitest\\first\\two.txt", 100); + create_file("msitest\\second\\three.txt", 100); + create_file("msitest\\cabout\\four.txt", 100); + create_file("msitest\\cabout\\new\\five.txt", 100); + create_file("msitest\\filename", 100); + create_file("msitest\\service.exe", 100); + + create_database_wordcount(msifile, ai_tables, + sizeof(ai_tables) / sizeof(msi_table), + msidbSumInfoSourceTypeAdminImage); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFileA("msitest.msi"); + DeleteFileA("msitest\\cabout\\new\\five.txt"); + DeleteFileA("msitest\\cabout\\four.txt"); + DeleteFileA("msitest\\second\\three.txt"); + DeleteFileA("msitest\\first\\two.txt"); + DeleteFileA("msitest\\one.txt"); + DeleteFileA("msitest\\service.exe"); + DeleteFileA("msitest\\filename"); + RemoveDirectoryA("msitest\\cabout\\new"); + RemoveDirectoryA("msitest\\cabout"); + RemoveDirectoryA("msitest\\second"); + RemoveDirectoryA("msitest\\first"); + RemoveDirectoryA("msitest"); +} + START_TEST(install) { DWORD len; @@ -5545,6 +5624,7 @@ START_TEST(install) test_MsiConfigureProductEx(); test_missingcomponent(); test_sourcedirprop(); + test_adminimage(); DeleteFileA("msitest.log");

1 0

Jacek Caban : msxml3: Fixed dynamic properties allocation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 57aa75f78f521777a56718ed3383518e6fa8151c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57aa75f78f521777a56718ed3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 13:55:47 2008 -0500 msxml3: Fixed dynamic properties allocation. --- dlls/msxml3/dispex.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 9272068..ab9d909 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -436,18 +436,37 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } if(grfdex & fdexNameEnsure) { + dispex_dynamic_data_t *dynamic_data; + TRACE("creating dynamic prop %s\n", debugstr_w(bstrName)); - if(!This->dynamic_data) { - This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); - This->dynamic_data->props = heap_alloc(This->dynamic_data->buf_size = 4); - }else if(This->dynamic_data->buf_size == This->dynamic_data->prop_cnt) { - This->dynamic_data->props = heap_realloc(This->dynamic_data->props, This->dynamic_data->buf_size<<=1); + if(This->dynamic_data) { + dynamic_data = This->dynamic_data; + }else { + dynamic_data = This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); + if(!dynamic_data) + return E_OUTOFMEMORY; + } + + if(!dynamic_data->buf_size) { + dynamic_data->props = heap_alloc(sizeof(dynamic_prop_t)*4); + if(!dynamic_data->props) + return E_OUTOFMEMORY; + dynamic_data->buf_size = 4; + }else if(dynamic_data->buf_size == dynamic_data->prop_cnt) { + dynamic_prop_t *new_props; + + new_props = heap_realloc(dynamic_data->props, sizeof(dynamic_prop_t)*(dynamic_data->buf_size<<1)); + if(!new_props) + return E_OUTOFMEMORY; + + dynamic_data->props = new_props; + dynamic_data->buf_size <<= 1; } - This->dynamic_data->props[This->dynamic_data->prop_cnt].name = heap_strdupW(bstrName); - VariantInit(&This->dynamic_data->props[This->dynamic_data->prop_cnt].var); - *pid = DISPID_DYNPROP_0 + This->dynamic_data->prop_cnt++; + dynamic_data->props[dynamic_data->prop_cnt].name = heap_strdupW(bstrName); + VariantInit(&dynamic_data->props[dynamic_data->prop_cnt].var); + *pid = DISPID_DYNPROP_0 + dynamic_data->prop_cnt++; return S_OK; }

1 0

Jacek Caban : msxml3: Silence invalid FIXME.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: d318813a5a0e837ba7a8cad7b9516cbb3febd75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d318813a5a0e837ba7a8cad7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 13:55:52 2008 -0500 msxml3: Silence invalid FIXME. --- dlls/msxml3/bsc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index bc1202a..1914ca8 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -69,7 +69,7 @@ static HRESULT WINAPI bsc_QueryInterface( return S_OK; } - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Jacek Caban : msxml3: Update orphaned list in put_documentElement.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: e7ff1019969650eda38e7957600fde9af5774984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ff1019969650eda38e79576… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 13:55:41 2008 -0500 msxml3: Update orphaned list in put_documentElement. --- dlls/msxml3/domdoc.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8ef0db4..c685889 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -922,6 +922,7 @@ static HRESULT WINAPI domdoc_put_documentElement( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); IXMLDOMNode *elementNode; + xmlNodePtr oldRoot; xmlnode *xmlNode; HRESULT hr; @@ -932,9 +933,17 @@ static HRESULT WINAPI domdoc_put_documentElement( return hr; xmlNode = impl_from_IXMLDOMNode( elementNode ); - xmlDocSetRootElement( get_doc(This), xmlNode->node); + + if(!xmlNode->node->parent) + if(xmldoc_remove_orphan(xmlNode->node->doc, xmlNode->node) != S_OK) + WARN("%p is not an orphan of %p\n", xmlNode->node->doc, xmlNode->node); + + oldRoot = xmlDocSetRootElement( get_doc(This), xmlNode->node); IXMLDOMNode_Release( elementNode ); + if(oldRoot) + xmldoc_add_orphan(oldRoot->doc, oldRoot); + return S_OK; }

1 0

Nikolay Sivov : gdiplus: Add some tests for pathiterator, fix leaks.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: dee8657be43f2f4e3411ee1a1394ad14fadff919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee8657be43f2f4e3411ee1a1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 16 20:31:25 2008 +0400 gdiplus: Add some tests for pathiterator, fix leaks. --- dlls/gdiplus/tests/pathiterator.c | 53 ++++++++++++++++++++++++++++++++++-- 1 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 79ce879..eddb24e 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -459,8 +459,6 @@ static void test_nextsubpath(void) INT start, end, result; BOOL closed; - GdipCreatePath(FillModeAlternate, &path); - /* empty path */ GdipCreatePath(FillModeAlternate, &path); GdipCreatePathIter(&iter, path); @@ -471,8 +469,8 @@ static void test_nextsubpath(void) expect(Ok, stat); expect(0, result); expect(TRUE, closed); - GdipCreatePathIter(&iter, path); + GdipDeletePathIter(iter); GdipDeletePath(path); } @@ -500,6 +498,55 @@ static void test_nextpathtype(void) expect(InvalidParameter, stat); stat = GdipPathIterNextPathType(iter, NULL, &type, &start, &end); expect(InvalidParameter, stat); + stat = GdipPathIterNextPathType(iter, &result, &type, NULL, NULL); + expect(InvalidParameter, stat); + + /* empty path */ + start = end = result = (INT)0xdeadbeef; + stat = GdipPathIterNextPathType(iter, &result, &type, &start, &end); + todo_wine expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); + todo_wine expect(0, result); + GdipDeletePathIter(iter); + + /* single figure */ + GdipAddPathLine(path, 0.0, 0.0, 10.0, 30.0); + GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; + type = 255; /* out of range */ + stat = GdipPathIterNextPathType(iter, &result, &type, &start, &end); + todo_wine expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); + expect(255, type); + todo_wine expect(0, result); + GdipDeletePathIter(iter); + + GdipAddPathEllipse(path, 0.0, 0.0, 35.0, 70.0); + GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; + type = 255; /* out of range */ + stat = GdipPathIterNextPathType(iter, &result, &type, &start, &end); + todo_wine expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); + expect(255, type); + todo_wine expect(0, result); + GdipDeletePathIter(iter); + + /* closed */ + GdipClosePathFigure(path); + GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; + type = 255; /* out of range */ + stat = GdipPathIterNextPathType(iter, &result, &type, &start, &end); + todo_wine expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); + expect(255, type); + todo_wine expect(0, result); + GdipDeletePathIter(iter); GdipDeletePath(path); }

1 0

Juan Lang : crypt32: Don' t check for no data to decode in CryptDecodeObject{Ex}, doing so masks some errors.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: de2a187bb732b92f88371dbca1b7159f78fa12ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2a187bb732b92f88371dbca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 09:11:50 2008 -0700 crypt32: Don't check for no data to decode in CryptDecodeObject{Ex}, doing so masks some errors. --- dlls/crypt32/decode.c | 10 ---------- dlls/crypt32/tests/cert.c | 1 - 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4ebe50a..3a487ea 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4979,11 +4979,6 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (!cbEncoded) - { - SetLastError(CRYPT_E_ASN1_EOD); - return FALSE; - } if (cbEncoded > MAX_ENCODED_LEN) { SetLastError(CRYPT_E_ASN1_LARGE); @@ -5031,11 +5026,6 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (!cbEncoded) - { - SetLastError(CRYPT_E_ASN1_EOD); - return FALSE; - } if (cbEncoded > MAX_ENCODED_LEN) { SetLastError(CRYPT_E_ASN1_LARGE); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5e00e3a..c26398b 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2636,7 +2636,6 @@ static void testHashToBeSigned(void) } SetLastError(0xdeadbeef); ret = CryptHashToBeSigned(0, 0, NULL, 0, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Correct last error when no data are passed to CRYPT_AsnDecodeInt.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 916e47861a94c17aadec26d7033f602e3468c818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916e47861a94c17aadec26d70… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 09:09:37 2008 -0700 crypt32: Correct last error when no data are passed to CRYPT_AsnDecodeInt. --- dlls/crypt32/decode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4ed2abe..4ebe50a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3454,7 +3454,7 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, if (!cbEncoded) { - SetLastError(CRYPT_E_ASN1_CORRUPT); + SetLastError(CRYPT_E_ASN1_EOD); ret = FALSE; } else if (pbEncoded[0] != ASN_INTEGER)

1 0

Aric Stewart : shell32/tests: Add tests for CommandLineToArgvW.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 2c9517d36bb2188d38705b65a61ec3f7fcb1e13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9517d36bb2188d38705b65a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 16 09:22:06 2008 -0500 shell32/tests: Add tests for CommandLineToArgvW. --- dlls/shell32/tests/shlexec.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3c62ac2..ac7915a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1605,6 +1605,74 @@ static void cleanup_test(void) CoUninitialize(); } +static void test_commandline(void) +{ + static const WCHAR one[] = {'o','n','e',0}; + static const WCHAR two[] = {'t','w','o',0}; + static const WCHAR three[] = {'t','h','r','e','e',0}; + static const WCHAR four[] = {'f','o','u','r',0}; + + static const WCHAR fmt1[] = {'%','s',' ','%','s',' ','%','s',' ','%','s',0}; + static const WCHAR fmt2[] = {' ','%','s',' ','%','s',' ','%','s',' ','%','s',0}; + static const WCHAR fmt3[] = {'%','s','=','%','s',' ','%','s','=','\"','%','s','\"',0}; + static const WCHAR fmt4[] = {'\"','%','s','\"',' ','\"','%','s',' ','%','s','\"',' ','%','s',0}; + static const WCHAR fmt5[] = {'\\','\"','%','s','\"',' ','%','s','=','\"','%','s','\\','\"',' ','\"','%','s','\\','\"',0}; + + static const WCHAR chkfmt1[] = {'%','s','=','%','s',0}; + static const WCHAR chkfmt2[] = {'%','s',' ','%','s',0}; + static const WCHAR chkfmt3[] = {'\\','\"','%','s','\"',0}; + static const WCHAR chkfmt4[] = {'%','s','=','%','s','\"',' ','%','s','\"',0}; + WCHAR cmdline[255]; + LPWSTR *args = (LPWSTR*)0xdeadcafe; + INT numargs = -1; + + wsprintfW(cmdline,fmt1,one,two,three,four); + args=CommandLineToArgvW(cmdline,&numargs); + if (args == NULL && numargs == -1) + { + win_skip("CommandLineToArgvW not implemented, skipping\n"); + return; + } + ok(numargs == 4, "expected 4 args, got %i\n",numargs); + ok(lstrcmpW(args[0],one)==0,"arg0 is not as expected\n"); + ok(lstrcmpW(args[1],two)==0,"arg1 is not as expected\n"); + ok(lstrcmpW(args[2],three)==0,"arg2 is not as expected\n"); + ok(lstrcmpW(args[3],four)==0,"arg3 is not as expected\n"); + + wsprintfW(cmdline,fmt2,one,two,three,four); + args=CommandLineToArgvW(cmdline,&numargs); + ok(numargs == 5, "expected 5 args, got %i\n",numargs); + ok(args[0][0]==0,"arg0 is not as expected\n"); + ok(lstrcmpW(args[1],one)==0,"arg1 is not as expected\n"); + ok(lstrcmpW(args[2],two)==0,"arg2 is not as expected\n"); + ok(lstrcmpW(args[3],three)==0,"arg3 is not as expected\n"); + ok(lstrcmpW(args[4],four)==0,"arg4 is not as expected\n"); + + wsprintfW(cmdline,fmt3,one,two,three,four); + args=CommandLineToArgvW(cmdline,&numargs); + ok(numargs == 2, "expected 2 args, got %i\n",numargs); + wsprintfW(cmdline,chkfmt1,one,two); + ok(lstrcmpW(args[0],cmdline)==0,"arg0 is not as expected\n"); + wsprintfW(cmdline,chkfmt1,three,four); + ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); + + wsprintfW(cmdline,fmt4,one,two,three,four); + args=CommandLineToArgvW(cmdline,&numargs); + ok(numargs == 3, "expected 3 args, got %i\n",numargs); + ok(lstrcmpW(args[0],one)==0,"arg0 is not as expected\n"); + wsprintfW(cmdline,chkfmt2,two,three); + ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); + ok(lstrcmpW(args[2],four)==0,"arg2 is not as expected\n"); + + wsprintfW(cmdline,fmt5,one,two,three,four); + args=CommandLineToArgvW(cmdline,&numargs); + ok(numargs == 2, "expected 2 args, got %i\n",numargs); + wsprintfW(cmdline,chkfmt3,one); + todo_wine ok(lstrcmpW(args[0],cmdline)==0,"arg0 is not as expected\n"); + wsprintfW(cmdline,chkfmt4,two,three,four); + todo_wine ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); +} + START_TEST(shlexec) { @@ -1624,6 +1692,7 @@ START_TEST(shlexec) test_exes_long(); test_dde(); test_dde_default_app(); + test_commandline(); cleanup_test(); }

1 0