November 2010 - Wine-Commits

Jacek Caban : shdocvw: Get rid of remaining *_THIS macros.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 7aa159275f86883fde21bc9a94c0adf12f3488ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa159275f86883fde21bc9a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:48:34 2010 +0100 shdocvw: Get rid of remaining *_THIS macros. --- dlls/shdocvw/client.c | 4 +- dlls/shdocvw/events.c | 64 +++++++++++++++++++++++--------------------- dlls/shdocvw/frame.c | 61 +++++++++++++++++++++--------------------- dlls/shdocvw/ie.c | 2 +- dlls/shdocvw/iexplore.c | 7 ++++- dlls/shdocvw/shdocvw.h | 10 +----- dlls/shdocvw/webbrowser.c | 13 ++++----- 7 files changed, 81 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aa159275f86883fde21b…

1 0

Paul Vriens : msxml3/tests: Fix some test failures on Win98/WinMe.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: dc2306de5a2a547ceb908b6208e54c2355448c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2306de5a2a547ceb908b620… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Nov 14 13:19:59 2010 +0100 msxml3/tests: Fix some test failures on Win98/WinMe. --- dlls/msxml3/tests/schema.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 189451e..12257e1 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -642,7 +642,7 @@ static void test_collection_content(void) content[i] = bstr; for (j = 0; j < i; ++j) - ok(lstrcmpW(content[j], bstr), "got duplicate entry\n"); + ok(winetest_strcmpW(content[j], bstr), "got duplicate entry\n"); } for (i = 0; i < 3; ++i) @@ -660,7 +660,7 @@ static void test_collection_content(void) ok(bstr != NULL && *bstr, "expected non-empty string\n"); for (j = 0; j < i; ++j) - ok(lstrcmpW(content[j], bstr), "got duplicate entry\n"); + ok(winetest_strcmpW(content[j], bstr), "got duplicate entry\n"); content[i] = bstr; }

1 0

Jacek Caban : mshtml: Moved cloneNode implementation to vtbl.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: f351dc5e7401a7cfa30ea3f5a966865df8bf4758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f351dc5e7401a7cfa30ea3f5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:41:39 2010 +0100 mshtml: Moved cloneNode implementation to vtbl. --- dlls/mshtml/htmlanchor.c | 3 ++- dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmldoc.c | 10 +++++++++- dlls/mshtml/htmlelem.c | 15 ++++++++++++++- dlls/mshtml/htmlembed.c | 3 ++- dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 3 ++- dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/htmlnode.c | 22 +++++++++++++++++----- dlls/mshtml/htmlobject.c | 3 ++- dlls/mshtml/htmloption.c | 3 ++- dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 3 ++- dlls/mshtml/htmltable.c | 3 ++- dlls/mshtml/htmltablerow.c | 3 ++- dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 12 +++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ 23 files changed, 80 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f351dc5e7401a7cfa30ea…

1 0

André Hentschel : widl: Fix for typelib generation when unaligned access to memory is not allowed.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: d4dc2a3a4f08c2c725ddf4203ecf6618b4e3fa19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4dc2a3a4f08c2c725ddf4203… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 13 21:42:34 2010 +0100 widl: Fix for typelib generation when unaligned access to memory is not allowed. --- tools/widl/write_msft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index da4eb25..874d3ad 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1208,7 +1208,7 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v int len = strlen(s), seg_len = (len + 6 + 3) & ~0x3; int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, seg_len, 0); *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = vt; - *((unsigned int *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = len; + memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &len, sizeof(len)); memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6], value, len); len += 6; while(len < seg_len) {

1 0

Jacek Caban : shdocvw: Get rid of CLIENTSITE_THIS.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: ca353c9b7ead5ae1ad4630c9fb962e284639d55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca353c9b7ead5ae1ad4630c9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:47:58 2010 +0100 shdocvw: Get rid of CLIENTSITE_THIS. --- dlls/shdocvw/client.c | 79 ++++++++++++++++++++-------------------------- dlls/shdocvw/dochost.c | 22 ++++++------ dlls/shdocvw/frame.c | 4 +- dlls/shdocvw/navigate.c | 8 ++-- dlls/shdocvw/shdocvw.h | 3 +- 5 files changed, 52 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca353c9b7ead5ae1ad463…

1 0

Jacek Caban : shdocvw: Get rid of DocHost-related *_THIS macros.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 538a870b89a6477790e5d97fd9e0004bc11d6c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538a870b89a6477790e5d97fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:48:09 2010 +0100 shdocvw: Get rid of DocHost-related *_THIS macros. --- dlls/shdocvw/client.c | 110 ++++++++++++++++++++++++++---------------------- dlls/shdocvw/dochost.c | 102 ++++++++++++++++++++------------------------ dlls/shdocvw/shdocvw.h | 24 +++------- 3 files changed, 113 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=538a870b89a6477790e5d…

1 0

Jacek Caban : mshtml: Use IUri for nsIURI::GetSpec implementation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 6a37caaecb77ec9af68f53354985fd723e0305d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a37caaecb77ec9af68f53354… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:41:18 2010 +0100 mshtml: Use IUri for nsIURI::GetSpec implementation. --- dlls/mshtml/nsio.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e268880..650745b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1693,13 +1693,10 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) { nsWineURI *This = NSURI_THIS(iface); - char speca[INTERNET_MAX_URL_LENGTH]; TRACE("(%p)->(%p)\n", This, aSpec); - WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); - nsACString_SetData(aSpec, speca); - return NS_OK; + return get_uri_string(This, Uri_PROPERTY_DISPLAY_URI, aSpec); } static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec)

1 0

Jacek Caban : mshtml: Use IUriBuilder for nsIURI::SetPath implementation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 3f383bac3b8b3c432187176da5b0a0d70f42f28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f383bac3b8b3c432187176da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 14 14:41:00 2010 +0100 mshtml: Use IUriBuilder for nsIURI::SetPath implementation. --- dlls/mshtml/nsio.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 91a4659..e268880 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1986,32 +1986,27 @@ static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath) static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) { nsWineURI *This = NSURI_THIS(iface); - const char *path; + const char *patha; + WCHAR *path; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPath)); - invalidate_uri(This); - - nsACString_GetData(aPath, &path); - if(This->wine_url) { - WCHAR new_url[INTERNET_MAX_URL_LENGTH]; - DWORD size = sizeof(new_url)/sizeof(WCHAR); - LPWSTR pathw; - HRESULT hres; + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - pathw = heap_strdupAtoW(path); - hres = UrlCombineW(This->wine_url, pathw, new_url, &size, 0); - heap_free(pathw); - if(SUCCEEDED(hres)) - set_wine_url(This, new_url); - else - WARN("UrlCombine failed: %08x\n", hres); - } + nsACString_GetData(aPath, &patha); + path = heap_strdupAtoW(patha); + if(!path) + return NS_ERROR_OUT_OF_MEMORY; - if(!This->nsuri) - return NS_OK; + hres = IUriBuilder_SetPath(This->uri_builder, path); + heap_free(path); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; - return nsIURI_SetPath(This->nsuri, aPath); + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval)

1 0

Paul Vriens : msi/tests: Cleanup properly on Win9x.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: e21115187e82991738555d560812250219af4b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21115187e82991738555d560… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Nov 14 19:39:42 2010 +0100 msi/tests: Cleanup properly on Win9x. --- dlls/msi/tests/install.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ab73289..58bc681 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5896,7 +5896,6 @@ static void test_icon_table(void) record = MsiCreateRecord(1); res = MsiRecordSetStream(record, 1, "icon.ico"); ok(res == ERROR_SUCCESS, "Failed to add stream data to record: %d\n", res); - DeleteFile("icon.ico"); query = "INSERT INTO `Icon` (`Name`, `Data`) VALUES ('testicon', ?)"; res = run_query(hdb, record, query); @@ -5904,6 +5903,8 @@ static void test_icon_table(void) res = MsiCloseHandle(record); ok(res == ERROR_SUCCESS, "Failed to close record handle: %d\n", res); + /* Delete the icon file after the handle is closed to make sure it's deleted on Win9x */ + DeleteFileA("icon.ico"); res = MsiDatabaseCommit(hdb); ok(res == ERROR_SUCCESS, "Failed to commit database: %d\n", res); res = MsiCloseHandle(hdb);

1 0

Jacek Caban : shdocvw: Get rid of *_THIS macros in navigate.c.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 2450a2d8343469ea963c5758204b8dd4f2f7f4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2450a2d8343469ea963c57582… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 13 17:48:21 2010 +0100 shdocvw: Get rid of *_THIS macros in navigate.c. --- dlls/shdocvw/navigate.c | 164 +++++++++++++++++++++++------------------------ dlls/shdocvw/shdocvw.h | 7 +-- 2 files changed, 83 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2450a2d8343469ea963c5…

1 0