February 2011 - Wine-Commits

Alexander Kochetkov : wineps.drv: All map modes should have inverted y-transforms.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: ecde55b7572a9b5c145d3cc3a934ddf99c267ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecde55b7572a9b5c145d3cc3a… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Thu Feb 10 03:08:12 2011 +0300 wineps.drv: All map modes should have inverted y-transforms. --- dlls/wineps.drv/download.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 52de752..cc57ae1 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -280,17 +280,8 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) physDev->font.size.xx = ps_round(ppem * xform.eM11); physDev->font.size.xy = ps_round(ppem * xform.eM12); - physDev->font.size.yx = ps_round(ppem * xform.eM21); - physDev->font.size.yy = ps_round(ppem * xform.eM22); - - switch(GetMapMode(physDev->hdc)) - { - case MM_TEXT: - case MM_ISOTROPIC: - case MM_ANISOTROPIC: - physDev->font.size.yx *= -1; - physDev->font.size.yy *= -1; - } + physDev->font.size.yx = -ps_round(ppem * xform.eM21); + physDev->font.size.yy = -ps_round(ppem * xform.eM22); physDev->font.underlineThickness = potm->otmsUnderscoreSize; physDev->font.underlinePosition = potm->otmsUnderscorePosition;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 760804ae4b7840b8e51dfc01a5b8ab409bfe5abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=760804ae4b7840b8e51dfc01a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 10 15:45:35 2011 +0100 po: Update French translation. --- po/fr.po | 140 +++++++++++++++++++++----------------------------------------- 1 files changed, 47 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=760804ae4b7840b8e51df…

1 0

Hans Leidekker : msi: Preserve existing advertise strings in the PublishComponents action.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 92b5b3fd8cb796ea41a888ce1e5bf600cdf457c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b5b3fd8cb796ea41a888ce1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 10 15:56:41 2011 +0100 msi: Preserve existing advertise strings in the PublishComponents action. --- dlls/msi/action.c | 61 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 716a77f..86aa33f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5305,13 +5305,14 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; LPCWSTR compgroupid, component, feature, qualifier, text; - LPWSTR advertise = NULL, output = NULL; + LPWSTR advertise = NULL, output = NULL, existing = NULL, p, q; HKEY hkey = NULL; UINT rc; MSICOMPONENT *comp; MSIFEATURE *feat; DWORD sz; MSIRECORD *uirow; + int len; feature = MSI_RecordGetString(rec, 5); feat = get_loaded_feature(package, feature); @@ -5338,30 +5339,56 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) rc = MSIREG_OpenUserComponentsKey(compgroupid, &hkey, TRUE); if (rc != ERROR_SUCCESS) goto end; - - text = MSI_RecordGetString(rec,4); - advertise = create_component_advertise_string(package, comp, feature); - - sz = strlenW(advertise); + advertise = create_component_advertise_string( package, comp, feature ); + text = MSI_RecordGetString( rec, 4 ); if (text) - sz += lstrlenW(text); - - sz+=3; - sz *= sizeof(WCHAR); - - output = msi_alloc_zero(sz); - strcpyW(output,advertise); - msi_free(advertise); + { + p = msi_alloc( (strlenW( advertise ) + strlenW( text ) + 1) * sizeof(WCHAR) ); + strcpyW( p, advertise ); + strcatW( p, text ); + msi_free( advertise ); + advertise = p; + } + existing = msi_reg_get_val_str( hkey, qualifier ); - if (text) - strcatW(output,text); + sz = strlenW( advertise ) + 1; + if (existing) + { + for (p = existing; *p; p += len) + { + len = strlenW( p ) + 1; + if (strcmpW( advertise, p )) sz += len; + } + } + if (!(output = msi_alloc( (sz + 1) * sizeof(WCHAR) ))) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + q = output; + if (existing) + { + for (p = existing; *p; p += len) + { + len = strlenW( p ) + 1; + if (strcmpW( advertise, p )) + { + memcpy( q, p, len * sizeof(WCHAR) ); + q += len; + } + } + } + strcpyW( q, advertise ); + q[strlenW( q ) + 1] = 0; msi_reg_set_val_multi_str( hkey, qualifier, output ); end: RegCloseKey(hkey); - msi_free(output); + msi_free( output ); + msi_free( advertise ); + msi_free( existing ); /* the UI chunk */ uirow = MSI_CreateRecord( 2 );

1 0

Jacek Caban : appwiz.cpl: Added support for installing packages from MSI files.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: e1e83bc58d2193b9e5db3564f53756b89d9596dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e83bc58d2193b9e5db3564f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 10 16:42:49 2011 +0100 appwiz.cpl: Added support for installing packages from MSI files. --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/addons.c | 45 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index ace85bb..4d67b57 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,5 +1,6 @@ MODULE = appwiz.cpl IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32 +DELAYIMPORTS = msi EXTRADEFS = -DINSTALL_DATADIR="\"$(datadir)\"" C_SRCS = \ diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index d19af66..c55806f 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -40,6 +40,7 @@ #include "wininet.h" #include "shellapi.h" #include "urlmon.h" +#include "msi.h" #include "appwiz.h" #include "res.h" @@ -242,6 +243,46 @@ static BOOL install_cab(LPCWSTR file_name) return TRUE; } +static BOOL install_msi_file(const WCHAR *file_name) +{ + ULONG res; + + res = MsiInstallProductW(file_name, NULL); + if(res != ERROR_SUCCESS) { + ERR("MsiInstallProduct failed: %u\n", res); + return FALSE; + } + + return TRUE; +} + +static BOOL install_file(const WCHAR *file_name) +{ + BYTE magic[4]; + HANDLE file; + DWORD size; + BOOL res; + + static const BYTE msi_magic[] = {0xd0,0xcf,0x11,0xe0}; + + file = CreateFileW(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) + return FALSE; + + res = ReadFile(file, magic, sizeof(magic), &size, NULL); + CloseHandle(file); + if(!res || size != sizeof(magic)) + return INET_E_DOWNLOAD_FAILURE; + + if(!memcmp(magic, "MSCF", sizeof(magic))) + return install_cab(file_name); + else if(!memcmp(magic, msi_magic, sizeof(magic))) + return install_msi_file(file_name); + + ERR("Unknown file magic\n"); + return FALSE; +} + static BOOL install_from_unix_file(const char *file_name) { LPWSTR dos_file_name; @@ -276,7 +317,7 @@ static BOOL install_from_unix_file(const char *file_name) MultiByteToWideChar( CP_ACP, 0, file_name, -1, dos_file_name, res); } - ret = install_cab(dos_file_name); + ret = install_file(dos_file_name); heap_free(dos_file_name); return ret; @@ -513,7 +554,7 @@ static DWORD WINAPI download_proc(PVOID arg) } if(sha_check(tmp_file)) - install_cab(tmp_file); + install_file(tmp_file); DeleteFileW(tmp_file); EndDialog(install_dialog, 0); return 0;

1 0

Austin English : msxml3/tests: Make sure return value is used (LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: cbbb4b8dbf112051e32f860a9e05006091c9c355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbbb4b8dbf112051e32f860a9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:41 2011 -0800 msxml3/tests: Make sure return value is used (LLVM/Clang). --- dlls/msxml3/tests/xmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index bc7422d..c70c9eb 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -433,6 +433,7 @@ static void test_persiststreaminit(void) hr = IXMLDocument_get_root(doc, &element); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = IXMLElement_put_text(element, str); + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); IXMLElement_Release(element); SysFreeString(str);

1 0

Austin English : shdocvw/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 7f290c9544533a4cf6b3286f37fe65077e92cd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f290c9544533a4cf6b3286f3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:44 2011 -0800 shdocvw/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shdocvw/tests/shdocvw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index 17ea8d0..e7c904b 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -268,7 +268,7 @@ static void test_ParseURLFromOutsideSourceA(void) if (0) { /* that test crash on native shdocvw */ - res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, NULL, &dummy); + pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, NULL, &dummy); } memset(buffer, '#', sizeof(buffer)-1);

1 0

Austin English : oleaut32/tests: Make sure return value is used (LLVM/Clang ).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: b8bf372e709b0a739aa4c7821db7300face54706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bf372e709b0a739aa4c7821… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:58 2011 -0800 oleaut32/tests: Make sure return value is used (LLVM/Clang). --- dlls/oleaut32/tests/safearray.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 849bd01..0c2b882 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -595,9 +595,10 @@ static void test_safearray(void) ok(hres == E_INVALIDARG,"SafeArraySetIID of non IID capable safearray did not return E_INVALIDARG, but %x\n",hres); hres = SafeArrayAllocDescriptor(1,&a); + ok(hres == S_OK,"SafeArrayAllocDescriptor should return S_OK, but got %x\n",hres); ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n"); hres = pSafeArraySetIID(a,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but %x\n",hres); + ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but got %x\n",hres); hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD failed with hres %x\n",hres); @@ -609,6 +610,7 @@ static void test_safearray(void) for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { a = NULL; hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a); + ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags); if (a->fFeatures & FADF_HAVEIID) { hres = pSafeArrayGetIID(a, &iid);

1 0

Austin English : msvcr90/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: c64a420ddb29abd95753a32194fde782b6cb18c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64a420ddb29abd95753a3219… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 9 13:43:38 2011 -0800 msvcr90/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index dc90103..ace9e35 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -747,9 +747,9 @@ static void test__atoflt(void) if (0) { /* crashes on native */ - ret = p_atoflt(NULL, NULL); - ret = p_atoflt(NULL, (char*)_atoflt_testdata[0].str); - ret = p_atoflt(&flt, NULL); + p_atoflt(NULL, NULL); + p_atoflt(NULL, (char*)_atoflt_testdata[0].str); + p_atoflt(&flt, NULL); } while (_atoflt_testdata[i].str) @@ -846,7 +846,7 @@ static void test__realloc_crt(void) if (0) { /* crashes on some systems starting Vista */ - mem = p_realloc_crt(NULL, 10); + p_realloc_crt(NULL, 10); } mem = p_malloc(10);

1 0

Jacek Caban : mshtml: Make nsIURI::[Get|Set] Username implementation IUri-based.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: 779ad051d54c4bff99a608348f252bb04d15c96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=779ad051d54c4bff99a608348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 10 12:58:00 2011 +0100 mshtml: Make nsIURI::[Get|Set]Username implementation IUri-based. --- dlls/mshtml/nsio.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d08908f..327b191 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1770,26 +1770,33 @@ static nsresult NSAPI nsURI_GetUsername(nsIURL *iface, nsACString *aUsername) TRACE("(%p)->(%p)\n", This, aUsername); - if(This->nsuri) - return nsIURI_GetUsername(This->nsuri, aUsername); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_USER_NAME, aUsername); } static nsresult NSAPI nsURI_SetUsername(nsIURL *iface, const nsACString *aUsername) { nsWineURI *This = impl_from_nsIURL(iface); + const char *usera; + WCHAR *user; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUsername)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetUsername(This->nsuri, aUsername); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aUsername, &usera); + user = heap_strdupAtoW(usera); + if(!user) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetUserName(This->uri_builder, user); + heap_free(user); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetPassword(nsIURL *iface, nsACString *aPassword)

1 0

Huw Davies : oleaut32: Rewrite ITypeInfo_GetDocumentation proxy/ stub to return only the information that is requested.
by Alexandre Julliard Feb. 10, 2011

Feb. 10, 2011

Module: wine Branch: master Commit: ef05072e27e3cd3e2eb1a8bee92eb0ea73233126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef05072e27e3cd3e2eb1a8bee… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 9 13:10:32 2011 +0000 oleaut32: Rewrite ITypeInfo_GetDocumentation proxy/stub to return only the information that is requested. --- dlls/oleaut32/usrmarshal.c | 66 ++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 002c2b7..f83b908 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1651,49 +1651,49 @@ HRESULT __RPC_STUB ITypeInfo_Invoke_Stub( return E_FAIL; } -HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy( - ITypeInfo* This, - MEMBERID memid, - BSTR* pBstrName, - BSTR* pBstrDocString, - DWORD* pdwHelpContext, - BSTR* pBstrHelpFile) +HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy(ITypeInfo *This, MEMBERID memid, + BSTR *name, BSTR *doc_string, + DWORD *help_context, BSTR *help_file) { - DWORD help_context; - BSTR name, doc_string, help_file; + DWORD dummy_help_context, flags = 0; + BSTR dummy_name, dummy_doc_string, dummy_help_file; HRESULT hr; - TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, name, doc_string, help_context, help_file); - /* FIXME: presumably refPtrFlags is supposed to be a bitmask of which ptrs we actually want? */ - hr = ITypeInfo_RemoteGetDocumentation_Proxy(This, memid, 0, &name, &doc_string, &help_context, &help_file); - if(SUCCEEDED(hr)) - { - if(pBstrName) *pBstrName = name; - else SysFreeString(name); + if(!name) name = &dummy_name; + else flags = 1; - if(pBstrDocString) *pBstrDocString = doc_string; - else SysFreeString(doc_string); + if(!doc_string) doc_string = &dummy_doc_string; + else flags |= 2; - if(pBstrHelpFile) *pBstrHelpFile = help_file; - else SysFreeString(help_file); + if(!help_context) help_context = &dummy_help_context; + else flags |= 4; + + if(!help_file) help_file = &dummy_help_file; + else flags |= 8; + + hr = ITypeInfo_RemoteGetDocumentation_Proxy(This, memid, flags, name, doc_string, help_context, help_file); + + /* We don't need to free the dummy BSTRs since the stub ensures that these will be NULLs. */ - if(pdwHelpContext) *pdwHelpContext = help_context; - } return hr; } -HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub( - ITypeInfo* This, - MEMBERID memid, - DWORD refPtrFlags, - BSTR* pBstrName, - BSTR* pBstrDocString, - DWORD* pdwHelpContext, - BSTR* pBstrHelpFile) +HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub(ITypeInfo *This, MEMBERID memid, + DWORD flags, BSTR *name, BSTR *doc_string, + DWORD *help_context, BSTR *help_file) { - TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, refPtrFlags, pBstrName, pBstrDocString, - pdwHelpContext, pBstrHelpFile); - return ITypeInfo_GetDocumentation(This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, flags, name, doc_string, help_context, help_file); + + *name = *doc_string = *help_file = NULL; + *help_context = 0; + + if(!(flags & 1)) name = NULL; + if(!(flags & 2)) doc_string = NULL; + if(!(flags & 4)) help_context = NULL; + if(!(flags & 8)) help_file = NULL; + + return ITypeInfo_GetDocumentation(This, memid, name, doc_string, help_context, help_file); } HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(

1 0