October 2008 - Wine-commits

James Hawkins : msi: Append a backslash to the AppSearch registry path.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 7620bb367ff5fa9f3e3f97c7ab794ceb0dfbb992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7620bb367ff5fa9f3e3f97c7a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 16 01:08:59 2008 -0500 msi: Append a backslash to the AppSearch registry path. --- dlls/msi/appsearch.c | 54 +++++++++++++++++++++++++++++----------------- dlls/msi/tests/package.c | 5 +--- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 71ac3cf..b335946 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -743,20 +743,21 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, LPCWSTR path, int depth, LPWSTR *appValue) { UINT rc; + LPWSTR val = NULL; TRACE("%p, %p, %s, %d, %p\n", package, sig, debugstr_w(path), depth, appValue); + if (ACTION_IsFullPath(path)) { if (sig->File) - rc = ACTION_RecurseSearchDirectory(package, appValue, sig, - path, depth); + rc = ACTION_RecurseSearchDirectory(package, &val, sig, path, depth); else { /* Recursively searching a directory makes no sense when the * directory to search is the thing you're trying to find. */ - rc = ACTION_CheckDirectory(package, path, appValue); + rc = ACTION_CheckDirectory(package, path, &val); } } else @@ -766,24 +767,37 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, int i; rc = ERROR_SUCCESS; - *appValue = NULL; - for (i = 0; rc == ERROR_SUCCESS && !*appValue && i < 26; i++) - if (drives & (1 << i)) - { - pathWithDrive[0] = 'A' + i; - if (GetDriveTypeW(pathWithDrive) == DRIVE_FIXED) - { - lstrcpynW(pathWithDrive + 3, path, - sizeof(pathWithDrive) / sizeof(pathWithDrive[0]) - 3); - if (sig->File) - rc = ACTION_RecurseSearchDirectory(package, appValue, - sig, pathWithDrive, depth); - else - rc = ACTION_CheckDirectory(package, pathWithDrive, - appValue); - } - } + for (i = 0; rc == ERROR_SUCCESS && !val && i < 26; i++) + { + if (!(drives & (1 << i))) + continue; + + pathWithDrive[0] = 'A' + i; + if (GetDriveTypeW(pathWithDrive) != DRIVE_FIXED) + continue; + + lstrcpynW(pathWithDrive + 3, path, + sizeof(pathWithDrive) / sizeof(pathWithDrive[0]) - 3); + + if (sig->File) + rc = ACTION_RecurseSearchDirectory(package, &val, sig, + pathWithDrive, depth); + else + rc = ACTION_CheckDirectory(package, pathWithDrive, &val); + } } + + if (val && val[lstrlenW(val) - 1] != '\\') + { + val = msi_realloc(val, (lstrlenW(val) + 2) * sizeof(WCHAR)); + if (!val) + rc = ERROR_OUTOFMEMORY; + else + PathAddBackslashW(val); + } + + *appValue = val; + TRACE("returning %d\n", rc); return rc; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6bb68dc..b6b3a78 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6379,10 +6379,7 @@ static void test_appsearch_reglocator(void) sprintf(path, "%s\\", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP13", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP14", prop, &size);

1 0

Marcus Meissner : mshtml: Initialize nswindow in create_doc_from_nsdoc.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: e69eb4716ce1916a4f612c0cf4d5e6859650a782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69eb4716ce1916a4f612c0cf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 16 09:33:07 2008 +0200 mshtml: Initialize nswindow in create_doc_from_nsdoc. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index fcabaa1..7fc6f30 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1664,7 +1664,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocument **ret) HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) { HTMLDocument *doc; - nsIDOMWindow *nswindow; + nsIDOMWindow *nswindow = NULL; HRESULT hres; TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppvObject);

1 0

Michael Stefaniuc : shdocvw/tests: Remove duplicated header include.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 88a6c9cd5407bb5fbf10d02bbdfbb4e4a5694ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a6c9cd5407bb5fbf10d02bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:16:26 2008 +0200 shdocvw/tests: Remove duplicated header include. --- dlls/shdocvw/tests/intshcut.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index c9e3ab0..cf0b225 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -20,7 +20,6 @@ #include <stdarg.h> #include <stdio.h> -#include <wine/test.h> #define COBJMACROS

1 0

Michael Stefaniuc : wininet: Remove duplicated header includes.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 61d77284aeaf898d07f44637b4032bc7d4f89178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d77284aeaf898d07f44637b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:16:41 2008 +0200 wininet: Remove duplicated header includes. --- dlls/wininet/netconnection.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 77f39bb..79e96a3 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -33,7 +33,6 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -58,9 +57,6 @@ #undef FAR #undef DSA #endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif #include <stdarg.h> #include <stdlib.h>

1 0

James Hawkins : msi: Append a backslash to the AppSearch directory path.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 3adf1e4e0e3f52f32659b3062e4a2ebcf7513bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adf1e4e0e3f52f32659b3062… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 16 01:08:45 2008 -0500 msi: Append a backslash to the AppSearch directory path. --- dlls/msi/appsearch.c | 26 ++++++++++++-------------- dlls/msi/tests/package.c | 10 ++-------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 70bf13a..71ac3cf 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -799,10 +799,12 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU 'D','r','L','o','c','a','t','o','r',' ', 'w','h','e','r','e',' ', 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; - LPWSTR parentName = NULL, path = NULL, parent = NULL; + LPWSTR parentName = NULL, parent = NULL; + WCHAR path[MAX_PATH]; WCHAR expanded[MAX_PATH]; MSIRECORD *row; int depth; + DWORD sz; UINT rc; TRACE("%s\n", debugstr_w(sig->Name)); @@ -829,33 +831,29 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU ACTION_FreeSignature(&parentSig); msi_free(parentName); } - /* now look for path */ - path = msi_dup_record_field(row,3); + + sz = MAX_PATH; + MSI_RecordGetStringW(row, 3, path, &sz); + if (MSI_RecordIsNull(row,4)) depth = 0; else depth = MSI_RecordGetInteger(row,4); + ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH); - msi_free(path); + if (parent) { - path = msi_alloc((strlenW(parent) + strlenW(expanded) + 1) * sizeof(WCHAR)); - if (!path) - { - rc = ERROR_OUTOFMEMORY; - goto end; - } strcpyW(path, parent); strcatW(path, expanded); } else - path = expanded; + strcpyW(path, expanded); + + PathAddBackslashW(path); rc = ACTION_SearchDirectory(package, sig, path, depth, appValue); -end: - if (path != expanded) - msi_free(path); msi_free(parent); msiobj_release(&row->hdr); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 581ffd5..6bb68dc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6783,19 +6783,13 @@ static void test_appsearch_drlocator(void) sprintf(path, "%s\\", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP2", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; sprintf(path, "%s\\", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size);

1 0

Jacek Caban : jscript: Added isFinite implementation.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: b3f23da2d6b4902e42262a5c9fa6cdb0ee9770c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f23da2d6b4902e42262a5c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 18:50:06 2008 -0500 jscript: Added isFinite implementation. --- dlls/jscript/global.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index e397c3d..39055fa 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -295,8 +295,27 @@ static HRESULT JSGlobal_isNaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR static HRESULT JSGlobal_isFinite(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT_BOOL ret = VARIANT_FALSE; + HRESULT hres; + + TRACE("\n"); + + if(arg_cnt(dp)) { + VARIANT num; + + hres = to_number(dispex->ctx, get_arg(dp,0), ei, &num); + if(FAILED(hres)) + return hres; + + if(V_VT(&num) != VT_R8 || (!isinf(V_R8(&num)) && !isnan(V_R8(&num)))) + ret = VARIANT_TRUE; + } + + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = ret; + } + return S_OK; } static INT char_to_int(WCHAR c)

1 0

Jacek Caban : jscript: Added undefined to number conversion implementation.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 7b41f777463441e9cc09a9576653c766c28df622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b41f777463441e9cc09a9576… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 18:49:59 2008 -0500 jscript: Added undefined to number conversion implementation. --- dlls/jscript/jsutils.c | 6 ++++++ dlls/jscript/tests/lang.js | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c6f4b9c..2adfcb7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.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" @@ -325,6 +328,9 @@ static HRESULT str_to_number(BSTR str, VARIANT *ret) HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) { switch(V_VT(v)) { + case VT_EMPTY: + num_set_nan(ret); + break; case VT_NULL: V_VT(ret) = VT_I4; V_I4(ret) = 0; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5f14eb1..5d53320 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -790,5 +790,6 @@ ok(isNaN(0.5) === false, "isNaN(0.5) !== 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"); reportSuccess();

1 0

Jacek Caban : jscript: Added NaN value implementation.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 53ade93cd9dfec1b7a6a7a6db967a5bea224d1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ade93cd9dfec1b7a6a7a6db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 18:49:51 2008 -0500 jscript: Added NaN value implementation. --- dlls/jscript/global.c | 15 +++++++++++++-- dlls/jscript/jscript.h | 10 ++++++++++ dlls/jscript/tests/lang.js | 3 +++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index a1c76de..e397c3d 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -108,8 +108,19 @@ static HRESULT constructor_call(DispatchEx *constr, LCID lcid, WORD flags, DISPP static HRESULT JSGlobal_NaN(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_nan(retv); + break; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT JSGlobal_Infinity(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 691ac9e..88bbb8d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -242,6 +242,16 @@ static inline void num_set_val(VARIANT *v, DOUBLE d) } } +static inline void num_set_nan(VARIANT *v) +{ + V_VT(v) = VT_R8; +#ifdef NAN + V_R8(v) = NAN; +#else + V_UI8(v) = (ULONGLONG)0x7ff80000<<32; +#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 b989645..5f14eb1 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -785,7 +785,10 @@ if (true) else ok(true, "else should be associated with nearest if statement"); +ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== 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"); reportSuccess();

1 0

Juan Lang : crypt32: Fix tests on WinME.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 28953bb9d211ca9a7c246783f434cbd2167cc456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28953bb9d211ca9a7c246783f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 15 13:34:27 2008 -0700 crypt32: Fix tests on WinME. --- dlls/crypt32/tests/msg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index f5dbec3..e8e7eb3 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -420,8 +420,10 @@ static void test_data_msg_update(void) &streamInfo); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", + GetLastError()); CryptMsgClose(msg); /* Calling update with a valid output function succeeds, even if the data * exceeds the size specified in the stream info. @@ -2028,8 +2030,10 @@ static void test_decode_msg_update(void) ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), FALSE); todo_wine - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", + GetLastError()); /* Changing the callback pointer after the fact yields the same error (so * the message must copy the stream info, not just store a pointer to it) */ @@ -2038,8 +2042,10 @@ static void test_decode_msg_update(void) ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), FALSE); todo_wine - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == STATUS_ILLEGAL_INSTRUCTION /* WinME */), + "Expected STATUS_ACCESS_VIOLATION or STATUS_ILLEGAL_INSTRUCTION, got %x\n", + GetLastError()); CryptMsgClose(msg); /* Empty non-final updates are allowed when streaming.. */

1 0

Juan Lang : crypt32: Fix a test failure on Win98.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: ad1c1c610737cb28435447394d2afe38db01bcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1c1c610737cb28435447394… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 15 13:36:56 2008 -0700 crypt32: Fix a test failure on Win98. --- dlls/crypt32/tests/cert.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 2027c4a..5e00e3a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1694,8 +1694,10 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || - GetLastError() == CRYPT_E_ASN1_EOD /* Win9x */), - "Expected STATUS_ACCESS_VIOLATION or CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + GetLastError() == CRYPT_E_ASN1_EOD /* Win9x */ || + GetLastError() == CRYPT_E_ASN1_BADTAG /* Win98 */), + "Expected STATUS_ACCESS_VIOLATION, CRYPT_E_ASN1_EOD, OR CRYPT_E_ASN1_BADTAG, got %08x\n", + GetLastError()); certBlob.cbData = size; certBlob.pbData = cert;

1 0