December 2010 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLObjectElement::get_object implementation.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 26049daf47b13c207ee5217056e3548824fa146c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26049daf47b13c207ee521705… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 03:38:21 2010 +0100 mshtml: Added IHTMLObjectElement::get_object implementation. --- dlls/mshtml/htmlobject.c | 6 ++- dlls/mshtml/pluginhost.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 4 ++ dlls/mshtml/tests/activex.c | 68 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 150 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26049daf47b13c207ee52…

1 0

Jacek Caban : shdocvw: Added support for QueryService(IID_IWebBrowserApp).
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: d3aa44b20bb04cae26798f2a69fcf80452bad761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3aa44b20bb04cae26798f2a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 03:28:34 2010 +0100 shdocvw: Added support for QueryService(IID_IWebBrowserApp). --- dlls/shdocvw/client.c | 5 ++++ dlls/shdocvw/tests/webbrowser.c | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index f1f4a3d..e94a32c 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -617,6 +617,11 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IDispatch_QueryInterface(This->disp, riid, ppv); } + if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { + TRACE("IWebBrowserApp service\n"); + return IDispatch_QueryInterface(This->disp, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 6e3d54f..afde2e1 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -39,6 +39,7 @@ #include "shlguid.h" #include "exdispid.h" #include "mimeinfo.h" +#include "hlink.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); @@ -157,6 +158,21 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -2807,6 +2823,31 @@ static void test_TranslateAccelerator(IUnknown *unk) test_UIActivate(unk, FALSE); } +static void test_dochost_qs(IUnknown *unk) +{ + IOleClientSite *client_site; + IServiceProvider *serv_prov; + IUnknown *service; + HRESULT hres; + + client_site = get_dochost(unk); + hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&serv_prov); + IOleClientSite_Release(client_site); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + ok(iface_cmp(service, unk), "service != unk\n"); + IUnknown_Release(service); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IWebBrowserApp, &IID_IHlinkFrame, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + ok(iface_cmp(service, unk), "service != unk\n"); + IUnknown_Release(service); + + IServiceProvider_Release(serv_prov); +} + static void test_WebBrowser(BOOL do_download) { IUnknown *unk = NULL; @@ -2855,6 +2896,8 @@ static void test_WebBrowser(BOOL do_download) ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2); IDispatch_Release(doc2); + + test_dochost_qs(unk); } test_ClientSite(unk, NULL, !do_download);

1 0

Jacek Caban : shdocvw: Moved getting dochost pointer to separated function.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: ccf9b229e6bb3885d0b0e15d15d866e13d52d67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf9b229e6bb3885d0b0e15d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 03:28:21 2010 +0100 shdocvw: Moved getting dochost pointer to separated function. --- dlls/shdocvw/tests/webbrowser.c | 211 ++++++++++++++++++++------------------- 1 files changed, 109 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccf9b229e6bb3885d0b0e…

1 0

Marcus Meissner : kernel32: Fixed size to GetEnvironmentVariableW.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: a601c75db3340ac56dbec8fd118bdd7e79be2f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a601c75db3340ac56dbec8fd1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 16 23:16:24 2010 +0100 kernel32: Fixed size to GetEnvironmentVariableW. --- dlls/kernel32/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e29e1b2..64c459a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -573,7 +573,7 @@ static void set_wow64_environment(void) /* set the PROCESSOR_ARCHITECTURE variable */ - if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch) )) + if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch)/sizeof(WCHAR) )) { if (is_win64) { @@ -581,7 +581,7 @@ static void set_wow64_environment(void) SetEnvironmentVariableW( arch6432W, NULL ); } } - else if (GetEnvironmentVariableW( archW, arch, sizeof(arch) )) + else if (GetEnvironmentVariableW( archW, arch, sizeof(arch)/sizeof(WCHAR) )) { if (is_wow64) {

1 0

Jacek Caban : shdocvw: Share get_LocationURL implementation between WebBrowser and InternetExplorer objects .
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 07b6e423d30db0b49df78ab68362c766ff6f3cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b6e423d30db0b49df78ab68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 03:28:06 2010 +0100 shdocvw: Share get_LocationURL implementation between WebBrowser and InternetExplorer objects. --- dlls/shdocvw/ie.c | 6 ++++-- dlls/shdocvw/navigate.c | 11 +++++++++++ dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 11 ++--------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 759bef7..05485e0 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -291,8 +291,10 @@ static HRESULT WINAPI InternetExplorer_get_LocationName(IWebBrowser2 *iface, BST static HRESULT WINAPI InternetExplorer_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationURL); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, LocationURL); + + return get_location_url(&This->doc_host, LocationURL); } static HRESULT WINAPI InternetExplorer_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 12efb60..6e3ea46 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -880,6 +880,17 @@ HRESULT go_home(DocHost *This) return navigate_url(This, wszPageName, NULL, NULL, NULL, NULL); } +HRESULT get_location_url(DocHost *This, BSTR *ret) +{ + FIXME("semi-stub\n"); + + *ret = This->url ? SysAllocString(This->url) : SysAllocStringLen(NULL, 0); + if(!*ret) + return E_OUTOFMEMORY; + + return This->url ? S_OK : S_FALSE; +} + static inline HlinkFrame *impl_from_IHlinkFrame(IHlinkFrame *iface) { return CONTAINING_RECORD(iface, HlinkFrame, IHlinkFrame_iface); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 6df8527..15a85ed 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -226,6 +226,7 @@ void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT go_home(DocHost*); void set_doc_state(DocHost*,READYSTATE); +HRESULT get_location_url(DocHost*,BSTR*); #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,BOOL); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 7d56115..89e413b 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -501,16 +501,9 @@ static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *Loca { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationURL); + TRACE("(%p)->(%p)\n", This, LocationURL); - if(!This->doc_host.url) { - static const WCHAR null_char = 0; - *LocationURL = SysAllocString(&null_char); - return S_FALSE; - } - - *LocationURL = SysAllocString(This->doc_host.url); - return S_OK; + return get_location_url(&This->doc_host, LocationURL); } static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Juan Lang : crypt32: Accept any matching CN when checking a certificate' s name.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 667aeb3ede3ddad63b387fad248b66c03690c5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667aeb3ede3ddad63b387fad2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 16 10:31:47 2010 -0800 crypt32: Accept any matching CN when checking a certificate's name. --- dlls/crypt32/chain.c | 19 ++++++++++--- dlls/crypt32/tests/chain.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 1fb368b..d7c10b3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3343,13 +3343,24 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) } else { - PCERT_RDN_ATTR attr; + DWORD i, j; /* If the certificate isn't using a DN attribute in the name, make - * make sure the common name matches. + * make sure at least one common name matches. From RFC 2818, + * section 3.1: + * "If more than one identity of a given type is present in the + * certificate (e.g., more than one dNSName name, a match in any + * one of the set is considered acceptable.)" */ - if ((attr = CertFindRDNAttr(szOID_COMMON_NAME, name))) - matches = match_common_name(server_name, attr); + for (i = 0; !matches && i < name->cRDN; i++) + for (j = 0; !matches && j < name->rgRDN[i].cRDNAttr; j++) + { + PCERT_RDN_ATTR attr = &name->rgRDN[i].rgRDNAttr[j]; + + if (attr->pszObjId && !strcmp(szOID_COMMON_NAME, + attr->pszObjId)) + matches = match_common_name(server_name, attr); + } } LocalFree(name); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 11f297c..71be975 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2568,6 +2568,39 @@ static const BYTE chain30_2[] = { 0x5e,0xe2,0x2b,0xf5,0xa1,0xee,0x02,0x7e,0x09,0x15,0xff,0xc9,0xf6,0xaf,0xf5, 0xcc,0xeb,0xfc,0xe7,0x3c,0x92,0xdb,0x31,0xab,0x1e,0xb8,0x9e,0xf0,0x5e,0xa3, 0x93,0xfe,0xab,0x26,0x7b,0x01,0xa8,0x98,0x88,0xbb,0xee }; +/* chain0_0 -> chain31_1: a chain whose end certificate has two CNs, a + * wildcard name "*.foo.com" and a non-wildcard name "foo.com". + */ +static const BYTE chain31_1[] = { +0x30,0x82,0x01,0xa2,0x30,0x82,0x01,0x0d,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x30, +0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72, +0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x24,0x31,0x22,0x30,0x0e,0x06,0x03,0x55,0x04,0x03, +0x13,0x07,0x66,0x6f,0x6f,0x2e,0x63,0x6f,0x6d,0x30,0x10,0x06,0x03,0x55,0x04, +0x03,0x13,0x09,0x2a,0x2e,0x66,0x6f,0x6f,0x2e,0x63,0x6f,0x6d,0x30,0x81,0x9d, +0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81, +0x8d,0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f, +0xe5,0x33,0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4, +0xc6,0xdc,0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5, +0xa7,0x48,0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6, +0x8b,0x47,0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf, +0x6b,0x05,0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40, +0xfc,0x6a,0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac, +0x85,0x85,0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23, +0xb2,0xd3,0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98, +0x72,0xa3,0x02,0x03,0x01,0x00,0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x05,0x03,0x81,0x81,0x00,0xa0,0x93,0x52,0x87,0x81,0xe2, +0xff,0x2a,0xc7,0xef,0x5f,0x3c,0xbc,0x88,0x99,0xc0,0x47,0x3e,0x13,0xe9,0x87, +0xfa,0x36,0xd7,0xb5,0xe8,0xdf,0x70,0xcc,0x36,0xe4,0x70,0x3c,0xcd,0xa2,0x0b, +0x31,0x6e,0x0a,0xb9,0x00,0xf0,0x4f,0xb6,0xc2,0xce,0xf4,0x33,0x1e,0xc0,0x29, +0xc0,0x73,0x0c,0xcf,0x28,0xa5,0x26,0x9d,0xc2,0xaf,0x85,0x30,0x81,0xbf,0xd1, +0x70,0x3f,0x69,0x15,0xc5,0x41,0x1d,0x8e,0xd4,0xfa,0x02,0xcd,0xba,0xf1,0xf2, +0x67,0xb5,0x45,0x29,0xad,0xe8,0x54,0x9a,0x0f,0x1a,0x8f,0xdf,0x16,0xf4,0xcb, +0x43,0x08,0xe5,0x78,0x2b,0x95,0xf3,0x75,0xb6,0x88,0xf0,0x6b,0x5c,0x5b,0x50, +0x04,0x91,0x3b,0x89,0x5a,0x60,0x1f,0xfc,0x36,0x53,0x32,0x36,0x0a,0x4d,0x03, +0x2c,0xd7 }; typedef struct _CONST_DATA_BLOB { @@ -3195,6 +3228,10 @@ static const CERT_TRUST_STATUS elementStatus30[] = { static const SimpleChainStatusCheck simpleStatus30[] = { { sizeof(elementStatus30) / sizeof(elementStatus30[0]), elementStatus30 }, }; +static CONST_DATA_BLOB chain31[] = { + { sizeof(chain0_0), chain0_0 }, + { sizeof(chain31_1), chain31_1 }, +}; static CONST_DATA_BLOB selfSignedChain[] = { { sizeof(selfSignedCert), selfSignedCert } }; @@ -4027,6 +4064,16 @@ static const ChainPolicyCheck invalidExtensionPolicyCheck = { { 0, CERT_E_CRITICAL, 0, 1, NULL}, &badDateNestingStatus, 0 }; +static const ChainPolicyCheck fooPolicyCheckWithMatchingName = { + { sizeof(chain31) / sizeof(chain31[0]), chain31 }, + { 0, 0, -1, -1, NULL}, NULL, 0 +}; + +static const ChainPolicyCheck fooPolicyCheckWithoutMatchingName = { + { sizeof(chain31) / sizeof(chain31[0]), chain31 }, + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 +}; + static const ChainPolicyCheck authenticodePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, @@ -4324,6 +4371,9 @@ static void check_ssl_policy(void) 'w','i','n','e','h','q','.','o','r','g',0 }; WCHAR a_dot_b_dot_winehq_dot_org[] = { 'a','.','b','.', 'w','i','n','e','h','q','.','o','r','g',0 }; + WCHAR foo_dot_com[] = { 'f','o','o','.','c','o','m',0 }; + WCHAR afoo_dot_com[] = { 'a','f','o','o','.','c','o','m',0 }; + WCHAR a_dot_foo_dot_com[] = { 'a','.','f','o','o','.','c','o','m',0 }; HCERTSTORE testRoot; CERT_CHAIN_ENGINE_CONFIG engineConfig = { sizeof(engineConfig), 0 }; HCERTCHAINENGINE engine; @@ -4473,6 +4523,19 @@ static void check_ssl_policy(void) sslPolicyPara.pwszServerName = NULL; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, invalidExtensionPolicyCheck, &oct2007, &policyPara); + /* Test chain31, which has two CNs, "*.foo.com" and "foo.com", against + * some names that match one of the CNs: + */ + sslPolicyPara.pwszServerName = foo_dot_com; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, + fooPolicyCheckWithMatchingName, &oct2007, &policyPara); + sslPolicyPara.pwszServerName = a_dot_foo_dot_com; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, + fooPolicyCheckWithMatchingName, &oct2007, &policyPara); + /* and against a name that doesn't match either CN: */ + sslPolicyPara.pwszServerName = afoo_dot_com; + CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, + fooPolicyCheckWithoutMatchingName, &oct2007, &policyPara); } static void testVerifyCertChainPolicy(void)

1 0

Hwang YunSong : cmdlgtst: Update Korean resource.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: b43947761216ce0e6ec94584ed275c3298b8d097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43947761216ce0e6ec94584e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 16 17:08:45 2010 +0900 cmdlgtst: Update Korean resource. --- programs/cmdlgtst/Ko.rc | 128 ++++++++++++++++++++++++----------------------- 1 files changed, 65 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43947761216ce0e6ec94…

1 0

Jacek Caban : mshtml: IHTMLDocument2 iface handling clean up.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: c63a5fa8fd99e131fbfb8e4886734147ad877a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63a5fa8fd99e131fbfb8e488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 16 14:59:51 2010 +0100 mshtml: IHTMLDocument2 iface handling clean up. --- dlls/mshtml/hlink.c | 6 +- dlls/mshtml/htmldoc.c | 279 +++++++++++++++++++++--------------------- dlls/mshtml/htmldoc3.c | 14 +- dlls/mshtml/htmldoc5.c | 12 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 2 +- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/olecmd.c | 6 +- dlls/mshtml/oleobj.c | 36 +++--- dlls/mshtml/olewnd.c | 16 ++-- dlls/mshtml/persist.c | 39 +++--- dlls/mshtml/service.c | 6 +- dlls/mshtml/view.c | 18 ++-- 18 files changed, 224 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c63a5fa8fd99e131fbfb8…

1 0

Huw Davies : gdi32: Clear the accel flags.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: aec376dcef20823b81d6c70926e02d5c27c40b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec376dcef20823b81d6c7092… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 7 11:37:14 2010 +0000 gdi32: Clear the accel flags. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e2db1aa..81c8e46 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6230,6 +6230,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { glyphset->cbThis = size; glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; } return size; }

1 0

Alexandre Julliard : libwine: Use the 64-bit preloader when starting 64-bit wine.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 5af634fd3b7ff7e4d6f8af34f6139315fdbbc8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af634fd3b7ff7e4d6f8af34f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 17:59:30 2010 +0100 libwine: Use the 64-bit preloader when starting 64-bit wine. --- libs/wine/config.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 93dc7e0..4a2bced 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -97,6 +97,14 @@ static char *xstrdup( const char *str ) return res; } +/* check if a string ends in a given substring */ +static inline int strendswith( const char* str, const char* end ) +{ + size_t len = strlen( str ); + size_t tail = strlen( end ); + return len >= tail && !strcmp( str + len - tail, end ); +} + /* remove all trailing slashes from a path name */ static inline void remove_trailing_slashes( char *path ) { @@ -448,19 +456,23 @@ const char *wine_get_build_id(void) /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ static void preloader_exec( char **argv, int use_preloader ) { -#if defined(linux) && defined(__i386__) +#ifdef linux if (use_preloader) { static const char preloader[] = "wine-preloader"; + static const char preloader64[] = "wine64-preloader"; char *p, *full_name; char **last_arg = argv, **new_argv; if (!(p = strrchr( argv[0], '/' ))) p = argv[0]; else p++; - full_name = xmalloc( p - argv[0] + sizeof(preloader) ); + full_name = xmalloc( p - argv[0] + sizeof(preloader64) ); memcpy( full_name, argv[0], p - argv[0] ); - memcpy( full_name + (p - argv[0]), preloader, sizeof(preloader) ); + if (strendswith( p, "64" )) + memcpy( full_name + (p - argv[0]), preloader64, sizeof(preloader64) ); + else + memcpy( full_name + (p - argv[0]), preloader, sizeof(preloader) ); /* make a copy of argv */ while (*last_arg) last_arg++; @@ -480,13 +492,10 @@ static void preloader_exec( char **argv, int use_preloader ) void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) { const char *path, *pos, *ptr; - int use_preloader = 0; + int use_preloader; - if (!name) /* no name means default loader */ - { - name = argv0_name; - use_preloader = 1; - } + if (!name) name = argv0_name; /* no name means default loader */ + use_preloader = !strendswith( name, "wineserver" ); if ((ptr = strrchr( name, '/' ))) {

1 0