November 2008 - Wine-commits

Jacek Caban : mshtml: Skip tests on old IE as soon as possible.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 60d12a3adb0dd6db639c212735b285c1d9254396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d12a3adb0dd6db639c21273… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 22 20:23:33 2008 +0100 mshtml: Skip tests on old IE as soon as possible. --- dlls/mshtml/tests/htmldoc.c | 65 ++++++++++++------------------------------ 1 files changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6b77e5b..1e932de 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -70,7 +70,6 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; -static BOOL show_fail; DEFINE_EXPECT(LockContainer); DEFINE_EXPECT(SetActiveObject); @@ -1678,11 +1677,6 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = NULL; hres = IOleDocumentView_UIActivate(view, TRUE); - - if(FAILED(hres)) { - skip("UIActivate failed: %08x\n", hres); - return hres; - } ok(hres == S_OK, "UIActivate failed: %08x\n", hres); CHECK_CALLED(CanInPlaceActivate); @@ -1738,14 +1732,6 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = (load_state == LD_COMPLETE ? (LPCOLESTR)0xdeadbeef : NULL); hres = IOleDocumentView_Show(view, TRUE); - if(FAILED(hres)) { - win_skip("Show failed\n"); - if(activeobj) - IOleInPlaceActiveObject_Release(activeobj); - IOleDocument_Release(document); - show_fail = TRUE; - return S_OK; - } ok(hres == S_OK, "Show failed: %08x\n", hres); CHECK_CALLED(CanInPlaceActivate); @@ -3238,7 +3224,7 @@ static HWND create_container_window(void) 515, 530, NULL, NULL, NULL, NULL); } -static HRESULT test_DoVerb(IOleObject *oleobj) +static void test_DoVerb(IOleObject *oleobj) { RECT rect = {0,0,500,500}; HRESULT hres; @@ -3251,8 +3237,6 @@ static HRESULT test_DoVerb(IOleObject *oleobj) expect_LockContainer_fLock = TRUE; hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, -1, container_hwnd, &rect); - if(FAILED(hres)) - return hres; ok(hres == S_OK, "DoVerb failed: %08x\n", hres); if(!container_locked) { @@ -3261,8 +3245,6 @@ static HRESULT test_DoVerb(IOleObject *oleobj) container_locked = TRUE; } CHECK_CALLED(ActivateMe); - - return hres; } #define CLIENTSITE_EXPECTPATH 0x00000001 @@ -3504,7 +3486,7 @@ static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) IOleInPlaceObjectWindowless_Release(windowlessobj); } -static HRESULT test_Activate(IUnknown *unk, DWORD flags) +static void test_Activate(IUnknown *unk, DWORD flags) { IOleObject *oleobj = NULL; IOleDocumentView *docview; @@ -3519,8 +3501,6 @@ static HRESULT test_Activate(IUnknown *unk, DWORD flags) hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); - if(FAILED(hres)) - return hres; hres = IOleObject_GetUserClassID(oleobj, NULL); ok(hres == E_INVALIDARG, "GetUserClassID returned: %08x, expected E_INVALIDARG\n", hres); @@ -3533,8 +3513,7 @@ static HRESULT test_Activate(IUnknown *unk, DWORD flags) test_ClientSite(oleobj, flags); test_InPlaceDeactivate(unk, FALSE); - - hres = test_DoVerb(oleobj); + test_DoVerb(oleobj); if(call_UIActivate == CallUIActivate_AfterShow) { hres = IOleObject_QueryInterface(oleobj, &IID_IOleDocumentView, (void **)&docview); @@ -3562,8 +3541,6 @@ static HRESULT test_Activate(IUnknown *unk, DWORD flags) IOleObject_Release(oleobj); test_OnFrameWindowActivate(unk); - - return hres; } static void test_Window(IUnknown *unk, BOOL expect_success) @@ -3651,9 +3628,23 @@ static void test_Hide(void) static HRESULT create_document(IUnknown **unk) { - HRESULT hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + IHTMLDocument5 *doc5; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)unk); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(*unk, &IID_IHTMLDocument5, (void**)&doc5); + if(SUCCEEDED(hres)) { + IHTMLDocument5_Release(doc5); + }else { + win_skip("Could not get IHTMLDocument5, probably too old IE\n"); + IUnknown_Release(*unk); + } + return hres; } @@ -3807,11 +3798,7 @@ static void test_HTMLDocument(BOOL do_load) if(!do_load) test_OnAmbientPropertyChange2(unk); - hres = test_Activate(unk, CLIENTSITE_EXPECTPATH); - if(FAILED(hres) || show_fail) { - IUnknown_Release(unk); - return; - } + test_Activate(unk, CLIENTSITE_EXPECTPATH); if(do_load) { test_download(FALSE, TRUE, TRUE); @@ -3904,10 +3891,6 @@ static void test_HTMLDocument_hlink(void) test_GetCurMoniker(unk, NULL, NULL); test_Persist(unk); test_Navigate(unk); - if(show_fail) { - IUnknown_Release(unk); - return; - } test_download(FALSE, TRUE, TRUE); @@ -3954,11 +3937,6 @@ static void test_HTMLDocument_StreamLoad(void) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); - if(show_fail) { - IUnknown_Release(unk); - IOleObject_Release(oleobj); - return; - } test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); IOleObject_Release(oleobj); @@ -4034,11 +4012,6 @@ static void test_editing_mode(BOOL do_load) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); - if(show_fail) { - IOleObject_Release(oleobj); - IUnknown_Release(unk); - return; - } test_edit_uiactivate(oleobj); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED);

1 0

Jacek Caban : mshtml: Skip tests on old IE as soon as possible.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: cc8511678dff65fc5cd8f19e970d468e81182ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8511678dff65fc5cd8f19e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 22 20:23:44 2008 +0100 mshtml: Skip tests on old IE as soon as possible. --- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 36d4f2a..8c7a113 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -409,12 +409,21 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(FAILED(hres)) { + win_skip("Could not get IHTMLDocument5, probably too old IE\n"); + IHTMLDocument2_Release(doc); + return NULL; + } + + IHTMLDocument5_Release(doc5); return doc; } @@ -3645,6 +3654,9 @@ static void run_domtest(const char *str, domtest_t test) HRESULT hres; doc = create_doc_with_string(str); + if(!doc) + return; + do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {

1 0

Francois Gouget : regedit: Fix handling of zero-byte binary values for ' regedit /E'.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: c880ccea1a1e4239256c1af018cca142833fa5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c880ccea1a1e4239256c1af01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 23 20:54:45 2008 +0100 regedit: Fix handling of zero-byte binary values for 'regedit /E'. --- programs/regedit/regproc.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 56d7a5a..c1aee21 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -927,12 +927,10 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len, DWORD type, BYTE *value, DWORD value_size, BOOL unicode) { - DWORD i, hex_pos, data_pos, column; + DWORD hex_pos, data_pos; const WCHAR *hex_prefix; const WCHAR hex[] = {'h','e','x',':',0}; WCHAR hex_buf[17]; - const WCHAR format[] = {'%','0','2','x',0}; - const WCHAR comma[] = {',',0}; const WCHAR concat[] = {'\\','\n',' ',' ',0}; DWORD concat_prefix, concat_len; const WCHAR newline[] = {'\n',0}; @@ -969,24 +967,29 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD *line_len += *line_len / (REG_FILE_HEX_LINE_LEN - concat_prefix) * concat_len; REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len); lstrcpyW(*line_buf + hex_pos, hex_prefix); - column = data_pos; /* no line wrap yet */ - i = 0; - while (1) + if (value_size) { - sprintfW(*line_buf + data_pos, format, (unsigned int)value[i]); - data_pos += 2; - if (++i == value_size) - break; + const WCHAR format[] = {'%','0','2','x',0}; + DWORD i, column; + + column = data_pos; /* no line wrap yet */ + i = 0; + while (1) + { + sprintfW(*line_buf + data_pos, format, (unsigned int)value[i]); + data_pos += 2; + if (++i == value_size) + break; - lstrcpyW(*line_buf + data_pos, comma); - data_pos++; - column += 3; + (*line_buf)[data_pos++] = ','; + column += 3; - /* wrap the line */ - if (column >= REG_FILE_HEX_LINE_LEN) { - lstrcpyW(*line_buf + data_pos, concat); - data_pos += concat_len; - column = concat_prefix; + /* wrap the line */ + if (column >= REG_FILE_HEX_LINE_LEN) { + lstrcpyW(*line_buf + data_pos, concat); + data_pos += concat_len; + column = concat_prefix; + } } } lstrcpyW(*line_buf + data_pos, newline);

1 0

Christian Costa : d3dxof: Support multi-dimentional array in templates.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 607062f3c3431c3a2413b09838279b4f8dc3caaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=607062f3c3431c3a2413b0983… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 23 21:30:00 2008 +0100 d3dxof: Support multi-dimentional array in templates. --- dlls/d3dxof/d3dxof.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 7c97771..79dc59b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1100,11 +1100,6 @@ static BOOL parse_template_members_list(parse_buffer * buf) { while (check_TOKEN(buf) == TOKEN_OBRACKET) { - if (nb_dims) - { - FIXME("No support for multi-dimensional array yet\n"); - return FALSE; - } get_TOKEN(buf); if (check_TOKEN(buf) == TOKEN_INTEGER) { @@ -1114,11 +1109,33 @@ static BOOL parse_template_members_list(parse_buffer * buf) } else { + int i; if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; + for (i = 0; i < idx_member; i++) + { + if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[i].name)) + { + if (buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[i].nb_dims) + { + ERR("Array cannot be used to specify variable array size\n"); + return FALSE; + } + if (buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[i].type != TOKEN_DWORD) + { + FIXME("Only DWORD supported to specify variable array size\n"); + return FALSE; + } + break; + } + } + if (i == idx_member) + { + ERR("Reference to unknown member %s\n", (char*)buf->value); + return FALSE; + } cur_member->dim_fixed[nb_dims] = FALSE; - /* Hack: Assume array size is specified in previous member */ - cur_member->dim_value[nb_dims] = idx_member - 1; + cur_member->dim_value[nb_dims] = i; } if (get_TOKEN(buf) != TOKEN_CBRACKET) return FALSE;

1 0

Jacek Caban : mshtml: Call necko's SetUploadStream from wrapper' s SetUploadStream.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 3dbeb15eacaf4e046b924804891f0313e7f68beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbeb15eacaf4e046b9248048… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 22 20:06:37 2008 +0100 mshtml: Call necko's SetUploadStream from wrapper's SetUploadStream. --- dlls/mshtml/nsio.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1843542..31fb897 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -756,25 +756,6 @@ static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamLis HRESULT hres; if(This->channel) { - if(This->post_data_stream) { - nsIUploadChannel *upload_channel; - - nsres = nsIChannel_QueryInterface(This->channel, &IID_nsIUploadChannel, - (void**)&upload_channel); - if(NS_SUCCEEDED(nsres)) { - nsACString empty_string; - nsACString_Init(&empty_string, ""); - - nsres = nsIUploadChannel_SetUploadStream(upload_channel, This->post_data_stream, - &empty_string, -1); - nsIUploadChannel_Release(upload_channel); - if(NS_FAILED(nsres)) - WARN("SetUploadStream failed: %08x\n", nsres); - - nsACString_Finish(&empty_string); - } - } - nsres = nsIChannel_AsyncOpen(This->channel, listener, context); if(mon) @@ -1162,6 +1143,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, { nsChannel *This = NSUPCHANNEL_THIS(iface); const char *content_type; + nsresult nsres; TRACE("(%p)->(%p %p %d)\n", This, aStream, aContentType, aContentLength); @@ -1177,9 +1159,25 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, if(aContentLength != -1) FIXME("Unsupported acontentLength = %d\n", aContentLength); + if(This->post_data_stream) + nsIInputStream_Release(This->post_data_stream); + This->post_data_stream = aStream; if(aStream) nsIInputStream_AddRef(aStream); - This->post_data_stream = aStream; + + if(This->post_data_stream) { + nsIUploadChannel *upload_channel; + + nsres = nsIChannel_QueryInterface(This->channel, &IID_nsIUploadChannel, + (void**)&upload_channel); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIUploadChannel_SetUploadStream(upload_channel, aStream, aContentType, aContentLength); + nsIUploadChannel_Release(upload_channel); + if(NS_FAILED(nsres)) + WARN("SetUploadStream failed: %08x\n", nsres); + + } + } return NS_OK; }

1 0

Henri Verbeet : wined3d: Move caps related constants and structures to wined3d_caps.h.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: d8f2e16cea1c54be0c6887bbe9005f4d889afa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f2e16cea1c54be0c6887bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 21 15:00:49 2008 +0100 wined3d: Move caps related constants and structures to wined3d_caps.h. --- include/wine/wined3d_caps.h | 278 +++++++++++++++++++++++++++++++++++++ include/wine/wined3d_interface.h | 1 + include/wine/wined3d_types.h | 282 -------------------------------------- 3 files changed, 279 insertions(+), 282 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f2e16cea1c54be0c688…

1 0

Juan Lang : crypt32: Implement CryptFormatObject for the Netscape string OIDs.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: afc7a7989701946efa55b2cbcb6025450f1d5c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc7a7989701946efa55b2cbc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 21 07:44:19 2008 -0800 crypt32: Implement CryptFormatObject for the Netscape string OIDs. --- dlls/crypt32/object.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 5784cc9..df5e509 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -2253,6 +2253,42 @@ static BOOL WINAPI CRYPT_FormatSpcFinancialCriteria(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_FormatUnicodeString(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + CERT_NAME_VALUE *value; + DWORD size; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_UNICODE_ANY_STRING, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &value, &size))) + { + if (!pbFormat) + *pcbFormat = value->Value.cbData; + else if (*pcbFormat < value->Value.cbData) + { + *pcbFormat = value->Value.cbData; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + *pcbFormat = value->Value.cbData; + strcpyW(str, (LPWSTR)value->Value.pbData); + } + } + return ret; +} + typedef BOOL (WINAPI *CryptFormatObjectFunc)(DWORD, DWORD, DWORD, void *, LPCSTR, const BYTE *, DWORD, void *, DWORD *); @@ -2318,6 +2354,14 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, format = CRYPT_FormatEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_NETSCAPE_CERT_TYPE)) format = CRYPT_FormatNetscapeCertType; + else if (!strcmp(lpszStructType, szOID_NETSCAPE_BASE_URL) || + !strcmp(lpszStructType, szOID_NETSCAPE_REVOCATION_URL) || + !strcmp(lpszStructType, szOID_NETSCAPE_CA_REVOCATION_URL) || + !strcmp(lpszStructType, szOID_NETSCAPE_CERT_RENEWAL_URL) || + !strcmp(lpszStructType, szOID_NETSCAPE_CA_POLICY_URL) || + !strcmp(lpszStructType, szOID_NETSCAPE_SSL_SERVER_NAME) || + !strcmp(lpszStructType, szOID_NETSCAPE_COMMENT)) + format = CRYPT_FormatUnicodeString; else if (!strcmp(lpszStructType, SPC_FINANCIAL_CRITERIA_OBJID)) format = CRYPT_FormatSpcFinancialCriteria; return format;

1 0

Alexandre Julliard : Wine release 1.1.9
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: website Branch: master Commit: 350c63415fd733eff7262a083ca65b5b20d03e43 URL: http://source.winehq.org/git/website.git/?a=commit;h=350c63415fd733eff7262a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 21 17:29:28 2008 +0100 Wine release 1.1.9 --- news/en/2008112101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2008112101.xml b/news/en/2008112101.xml new file mode 100644 index 0000000..8bfb02f --- /dev/null +++ b/news/en/2008112101.xml @@ -0,0 +1,16 @@ +<news> +<date>November 21, 2008</date> +<title>Wine 1.1.9 Released</title> +<body> + The Wine development release 1.1.9 is now available. + <a href="?announce=1.1.9">What's new</a> in this release: +<ul> + <li>A large number of regression test fixes.</li> + <li>Performance improvements in memory management.</li> + <li>Improved POP3 support in inetcomm.</li> + <li>Initial implementation of the XInput DLL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : shdocvw: Fix the computation of the default extents.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: e37f8f23f123f34cf2369ab5d5acb4395e57efbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37f8f23f123f34cf2369ab5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 21 17:07:21 2008 +0100 shdocvw: Fix the computation of the default extents. --- dlls/shdocvw/oleobject.c | 6 +++--- dlls/shdocvw/tests/webbrowser.c | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 9a38cf0..198ff2a 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -917,9 +917,9 @@ void WebBrowser_OleObject_Init(WebBrowser *This) memset(&This->clip_rect, 0, sizeof(RECT)); memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); - /* The size is dpi dependent */ - This->extent.cx = 127000 / dpi_x; - This->extent.cy = 50800 / dpi_y; + /* Default size is 50x20 pixels, in himetric units */ + This->extent.cx = MulDiv( 50, 2540, dpi_x ); + This->extent.cy = MulDiv( 20, 2540, dpi_y ); } void WebBrowser_OleObject_Destroy(WebBrowser *This) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index ec036c5..76dfbf7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1814,7 +1814,7 @@ static void test_GetControlInfo(IUnknown *unk) static void test_Extent(IUnknown *unk) { IOleObject *oleobj; - SIZE size; + SIZE size, expected; HRESULT hres; DWORD dpi_x; DWORD dpi_y; @@ -1836,10 +1836,11 @@ static void test_Extent(IUnknown *unk) size.cx = size.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &size); ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - /* The default size is dpi dependent (96:1323x529 / 120:1058x423) */ - ok(size.cx == (127000 / dpi_x) && - size.cy == (50800 / dpi_y), "size = {%d %d} (expected %d %d)\n", - size.cx, size.cy, 127000 / dpi_x, 50800 / dpi_y); + /* Default size is 50x20 pixels, in himetric units */ + expected.cx = MulDiv( 50, 2540, dpi_x ); + expected.cy = MulDiv( 20, 2540, dpi_y ); + ok(size.cx == expected.cx && size.cy == expected.cy, "size = {%d %d} (expected %d %d)\n", + size.cx, size.cy, expected.cx, expected.cy ); size.cx = 800; size.cy = 700;

1 0

Alexandre Julliard : Release 1.1.9.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 12c809056eafceb3c1ff85fe90b1400739ed00f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c809056eafceb3c1ff85fe9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 21 17:20:28 2008 +0100 Release 1.1.9. --- ANNOUNCE | 1066 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 530 insertions(+), 556 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12c809056eafceb3c1ff8…

1 0