March 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : msxml3: Change long to LONG in msxml.idl.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: de68b01e8c2fb62a9fc3749d69783ff6cb87179e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de68b01e8c2fb62a9fc3749d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 23:28:42 2009 +0100 msxml3: Change long to LONG in msxml.idl. --- dlls/msxml3/tests/xmldoc.c | 24 ++++++++++++------------ dlls/msxml3/tests/xmlelem.c | 24 ++++++++++++------------ dlls/msxml3/xmldoc.c | 2 +- dlls/msxml3/xmlelem.c | 14 +++++++------- include/msxml.idl | 20 ++++++++++---------- 5 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de68b01e8c2fb62a9fc37…

1 0

Michael Stefaniuc : include: Change long to LONG in tom.idl.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 43046481f77010edaaa16cdcc0319f7cb7f83770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43046481f77010edaaa16cdcc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 23:27:55 2009 +0100 include: Change long to LONG in tom.idl. --- dlls/riched20/richole.c | 222 +++++++++++++++++++------------------- include/tom.idl | 282 +++++++++++++++++++++++----------------------- 2 files changed, 252 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43046481f77010edaaa16…

1 0

Jacek Caban : mshtml: Added IHTMLStyle::put_cssText implementation.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 3a118f86f776874dffe371ed976270cb8adc4ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a118f86f776874dffe371ed9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 20:46:01 2009 +0100 mshtml: Added IHTMLStyle::put_cssText implementation. --- dlls/mshtml/htmlstyle.c | 16 ++++++++++++++-- dlls/mshtml/tests/dom.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5fa31c8..7641701 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2056,8 +2056,20 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakAfter(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&text_str, v); + nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + FIXME("SetCssStyle failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fa36c6e..f95b753 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1943,6 +1943,18 @@ static void _test_style_csstext(unsigned line, IHTMLStyle *style, const char *ex SysFreeString(text); } +#define test_style_set_csstext(s,t) _test_style_set_csstext(__LINE__,s,t) +static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const char *text) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(text); + hres = IHTMLStyle_put_cssText(style, tmp); + ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + SysFreeString(tmp); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -3590,6 +3602,20 @@ static void test_default_style(IHTMLStyle *style) } } +static void test_set_csstext(IHTMLStyle *style) +{ + VARIANT v; + HRESULT hres; + + test_style_set_csstext(style, "background-color: black;"); + + hres = IHTMLStyle_get_backgroundColor(style, &v); + ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "black"), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + static void test_default_selection(IHTMLDocument2 *doc) { IHTMLSelectionObject *selection; @@ -3830,8 +3856,6 @@ static void test_defaults(IHTMLDocument2 *doc) test_location(doc); test_navigator(doc); - IHTMLStyle_Release(style); - elem2 = get_elem2_iface((IUnknown*)elem); hres = IHTMLElement2_get_currentStyle(elem2, &cstyle); ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres); @@ -3843,6 +3867,9 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElement_Release(elem); + test_set_csstext(style); + IHTMLStyle_Release(style); + hres = IHTMLDocument2_get_styleSheets(doc, &stylesheetcol); ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Make sure that HTML headers are terminated by endline .
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 00289dd19adfee639fe5b5e921d086aa3e7a91f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00289dd19adfee639fe5b5e92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 20:46:27 2009 +0100 mshtml: Make sure that HTML headers are terminated by endline. --- dlls/mshtml/persist.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a207266..81f9216 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -131,11 +131,15 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) static const char content_length[] = "Content-Length: %u\r\n\r\n"; - data = heap_alloc(headers_len+post_len+sizeof(content_length)+8); + data = heap_alloc(headers_len+post_len+sizeof(content_length)+10); if(headers_len) { WideCharToMultiByte(CP_ACP, 0, headers, -1, data, headers_len, NULL, NULL); len = fix_headers(data, post_len); + if(len >= 2 && (data[len-1] != '\n' || data[len-2] != '\r')) { + data[len++] = '\r'; + data[len++] = '\n'; + } } if(post_len) {

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_innerHTML implementation.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 76d667caf190b922929bdfc147add3a51583dad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d667caf190b922929bdfc14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 21:23:18 2009 +0100 mshtml: Added IHTMLElement::put_innerHTML implementation. --- dlls/mshtml/htmlelem.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 11d0fb7..444cf83 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -833,8 +833,37 @@ static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsAString html_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&html_str, NULL); + nsres = nsIDOMNSHTMLElement_GetInnerHTML(nselem, &html_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *html; + + nsAString_GetData(&html_str, &html); + *p = *html ? SysAllocString(html) : NULL; + }else { + FIXME("SetInnerHtml failed %08x\n", nsres); + *p = NULL; + } + + nsAString_Finish(&html_str); + return S_OK; } static HRESULT WINAPI HTMLElement_put_innerText(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 69ed3c0..a5b9cc6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1132,6 +1132,39 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const ch } +#define test_elem_innerhtml(e,t) _test_elem_innerhtml(__LINE__,e,t) +static void _test_elem_innerhtml(unsigned line, IUnknown *unk, const char *inner_html) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR html; + HRESULT hres; + + hres = IHTMLElement_get_innerHTML(elem, &html); + ok_(__FILE__,line)(hres == S_OK, "get_innerHTML failed: %08x\n", hres); + if(inner_html) + ok_(__FILE__,line)(!strcmp_wa(html, inner_html), "unexpected innerHTML: %s\n", dbgstr_w(html)); + else + ok_(__FILE__,line)(!html, "innerHTML = %s\n", dbgstr_w(html)); + + IHTMLElement_Release(elem); + SysFreeString(html); +} + +#define test_elem_set_innerhtml(e,t) _test_elem_set_innerhtml(__LINE__,e,t) +static void _test_elem_set_innerhtml(unsigned line, IUnknown *unk, const char *inner_html) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR html; + HRESULT hres; + + html = a2bstr(inner_html); + hres = IHTMLElement_put_innerHTML(elem, html); + ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08x\n", hres); + + IHTMLElement_Release(elem); + SysFreeString(html); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -4051,6 +4084,7 @@ static void test_elems(IHTMLDocument2 *doc) static const WCHAR imgidW[] = {'i','m','g','i','d',0}; static const WCHAR inW[] = {'i','n',0}; static const WCHAR xW[] = {'x',0}; + static const WCHAR yW[] = {'y',0}; static const WCHAR sW[] = {'s',0}; static const WCHAR scW[] = {'s','c',0}; static const WCHAR xxxW[] = {'x','x','x',0}; @@ -4449,6 +4483,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); } + elem = get_doc_elem_by_id(doc, yW); + test_elem_set_innerhtml((IUnknown*)elem, "inner html"); + test_elem_innerhtml((IUnknown*)elem, "inner html"); + test_elem_set_innerhtml((IUnknown*)elem, ""); + test_elem_innerhtml((IUnknown*)elem, NULL); + IHTMLElement_Release(elem); + IHTMLDocument3_Release(doc3); } @@ -4515,6 +4556,7 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node3); test_elem_innertext(body, "insert test"); + test_elem_innerhtml((IUnknown*)body, "insert test"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); if(hres == S_OK)

1 0

Jacek Caban : mshtml: Added IHTMLStyle::get_cssText implementation.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 50126adf8bad80a0a7b7b816c2e13af7fa7c281b URL: http://source.winehq.org/git/wine.git/?a=commit;h=50126adf8bad80a0a7b7b816c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 9 20:45:48 2009 +0100 mshtml: Added IHTMLStyle::get_cssText implementation. --- dlls/mshtml/htmlstyle.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3727c8e..5fa31c8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2063,8 +2063,26 @@ static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: Gecko style formatting is different than IE (uppercase). */ + nsAString_Init(&text_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_GetCssText(This->nsstyle, &text_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *text; + + nsAString_GetData(&text_str, &text); + *p = *text ? SysAllocString(text) : NULL; + }else { + FIXME("GetCssStyle failed: %08x\n", nsres); + *p = NULL; + } + + nsAString_Finish(&text_str); + return S_OK; } static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, long v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a5b9cc6..fa36c6e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1927,6 +1927,22 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) } } +#define test_style_csstext(s,t) _test_style_csstext(__LINE__,s,t) +static void _test_style_csstext(unsigned line, IHTMLStyle *style, const char *extext) +{ + BSTR text = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLStyle_get_cssText(style, &text); + ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); + if(extext) + ok_(__FILE__,line)(!strcmp_wa(text, extext), "cssText = %s\n", dbgstr_w(text)); + else + ok_(__FILE__,line)(!text, "cssText = %s\n", dbgstr_w(text)); + + SysFreeString(text); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -2608,6 +2624,8 @@ static void test_default_style(IHTMLStyle *style) test_disp((IUnknown*)style, &DIID_DispHTMLStyle); test_ifaces((IUnknown*)style, style_iids); + test_style_csstext(style, NULL); + hres = IHTMLStyle_get_position(style, &str); ok(hres == S_OK, "get_position failed: %08x\n", hres); ok(!str, "str=%s\n", dbgstr_w(str));

1 0

Alexandre Julliard : user32/tests: Fix some message sequences for Vista and Win9x.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 925c1c4ed245a31cb644f88ef1067454a5216d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925c1c4ed245a31cb644f88ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 17:54:16 2009 +0100 user32/tests: Fix some message sequences for Vista and Win9x. --- dlls/user32/tests/msg.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3c9a1f4..054cc03 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -181,6 +181,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { WM_ERASEBKGND, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SYNCPAINT, sent|optional }, + { WM_GETTITLEBARINFOEX, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -498,6 +499,7 @@ static const struct message WmShowMaxOverlappedSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SYNCPAINT, sent|optional }, + { WM_GETTITLEBARINFOEX, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, @@ -520,6 +522,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, { WM_PAINT, sent|optional }, + { WM_GETTITLEBARINFOEX, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } @@ -556,6 +559,7 @@ static const struct message WmShowRestoreMinOverlappedSeq[] = { { WM_ACTIVATE, sent|wparam, 1 }, { WM_GETTEXT, sent|optional }, { WM_PAINT, sent|optional }, + { WM_GETTITLEBARINFOEX, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } @@ -1274,6 +1278,7 @@ static const struct message WmEndCustomDialogSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_GETTEXT, sent|optional|defwinproc }, + { WM_GETTEXT, sent|optional|defwinproc }, { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, @@ -1352,6 +1357,7 @@ static const struct message WmModalDialogSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_PAINT, sent|optional }, { WM_CTLCOLORBTN, sent|optional }, + { WM_GETTITLEBARINFOEX, sent|optional }, { WM_ENTERIDLE, sent|parent|optional }, { WM_ENTERIDLE, sent|parent|optional }, { WM_ENTERIDLE, sent|parent|optional }, @@ -8208,8 +8214,8 @@ static const struct message ScrollWindowPaint1[] = { { WM_GETTEXT, sent|optional }, { WM_GETTEXT, sent|optional }, { WM_GETTEXT, sent|optional }, - { WM_GETTEXT, sent|optional }, - { WM_GETTEXT, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, { 0 } }; @@ -10449,13 +10455,8 @@ static const struct message SetActiveWindowSeq0[] = { WM_KILLFOCUS, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, - { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|optional }, + { WM_IME_SETCONTEXT, sent|optional }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_SETFOCUS, sent|defwinproc|optional }, @@ -11326,6 +11327,12 @@ static void test_menu_messages(void) skip( "queuing key events not supported\n" ); goto done; } + /* win98 queues only a WM_KEYUP and doesn't start menu tracking */ + if (sequence[0].message == WM_KEYUP && sequence[0].wParam == VK_MENU) + { + win_skip( "menu tracking through VK_MENU not supported\n" ); + goto done; + } ok_sequence(wm_popup_menu_1, "popup menu command", FALSE); /* Alt+F, Right, Enter */

1 0

Francois Gouget : winmm: Try to load the Esound driver as a last resort.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 8f2b4954b0786e4c768f0c536b3f313d1a9e145b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2b4954b0786e4c768f0c536… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 9 20:15:14 2009 +0100 winmm: Try to load the Esound driver as a last resort. This gets sound working out of the box on Solaris. --- dlls/winmm/winemm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index ce6a649..7ef97f0 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -25,7 +25,7 @@ #include "winbase.h" #include "mmddk.h" -#define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio" +#define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio,esd" #define WINE_DEFAULT_WINMM_MAPPER "msacm32.drv" #define WINE_DEFAULT_WINMM_MIDI "midimap.dll"

1 0

Alexandre Julliard : user32/tests: Avoid snprintf, it's broken on Mingw.
by Alexandre Julliard 10 Mar '09

10 Mar '09

Module: wine Branch: master Commit: 60ed3428da4cd8645228e812199d535f3d82f12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ed3428da4cd8645228e8121… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 17:49:56 2009 +0100 user32/tests: Avoid snprintf, it's broken on Mingw. --- dlls/user32/tests/msg.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3a20cba..3c9a1f4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1776,13 +1776,13 @@ static void add_message_(int line, const struct recvd_message *msg) }; const char *code_name = (msg->message <= HCBT_SETFOCUS) ? CBT_code_name[msg->message] : "Unknown"; - snprintf( seq->output, sizeof(seq->output), "%s: hook %d (%s) wp %08lx lp %08lx", - msg->descr, msg->message, code_name, msg->wParam, msg->lParam ); + sprintf( seq->output, "%s: hook %d (%s) wp %08lx lp %08lx", + msg->descr, msg->message, code_name, msg->wParam, msg->lParam ); } else if (msg->flags & winevent_hook) { - snprintf( seq->output, sizeof(seq->output), "%s: winevent %p %08x %08lx %08lx", - msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam ); + sprintf( seq->output, "%s: winevent %p %08x %08lx %08lx", + msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam ); } else { @@ -1793,8 +1793,7 @@ static void add_message_(int line, const struct recvd_message *msg) { WINDOWPOS *winpos = (WINDOWPOS *)msg->lParam; - snprintf( seq->output, sizeof(seq->output), - "%s: %p WM_WINDOWPOS%s wp %08lx lp %08lx after %p x %d y %d cx %d cy %d flags %s", + sprintf( seq->output, "%s: %p WM_WINDOWPOS%s wp %08lx lp %08lx after %p x %d y %d cx %d cy %d flags %s", msg->descr, msg->hwnd, (msg->message == WM_WINDOWPOSCHANGING) ? "CHANGING" : "CHANGED", msg->wParam, msg->lParam, winpos->hwndInsertAfter, @@ -1815,10 +1814,9 @@ static void add_message_(int line, const struct recvd_message *msg) DRAW_ITEM_STRUCT di; DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)msg->lParam; - snprintf( seq->output, sizeof(seq->output), - "%s: %p WM_DRAWITEM: type %x, ctl_id %x, item_id %x, action %x, state %x", - msg->descr, msg->hwnd, dis->CtlType, dis->CtlID, - dis->itemID, dis->itemAction, dis->itemState); + sprintf( seq->output, "%s: %p WM_DRAWITEM: type %x, ctl_id %x, item_id %x, action %x, state %x", + msg->descr, msg->hwnd, dis->CtlType, dis->CtlID, + dis->itemID, dis->itemAction, dis->itemState); di.u.lp = 0; di.u.item.type = dis->CtlType; @@ -1832,8 +1830,8 @@ static void add_message_(int line, const struct recvd_message *msg) } default: if (msg->message >= 0xc000) return; /* ignore registered messages */ - snprintf( seq->output, sizeof(seq->output), "%s: %p %04x wp %08lx lp %08lx", - msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam ); + sprintf( seq->output, "%s: %p %04x wp %08lx lp %08lx", + msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam ); } } }

1 0

Henri Verbeet : wined3d: Use shader_glsl_get_write_mask_size() to calculate the write mask size.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: 695c69f6a0a4a1953dabe1bf42c4585a4854b037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=695c69f6a0a4a1953dabe1bf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 9 14:31:28 2009 +0100 wined3d: Use shader_glsl_get_write_mask_size() to calculate the write mask size. --- dlls/wined3d/glsl_shader.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6d82a6a..88c78d2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2492,6 +2492,7 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + UINT mask_size; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, &src0_param); @@ -2501,8 +2502,10 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) * It is a dependent read - not valid with conditional NP2 textures */ shader_glsl_get_sample_function(sampler_type, 0, &sample_function); + mask_size = shader_glsl_get_write_mask_size(sample_function.coord_mask); - switch(count_bits(sample_function.coord_mask)) { + switch(mask_size) + { case 1: sprintf(coord_param, "dot(gl_TexCoord[%u].xyz, %s)", sampler_idx, src0_param.param_str); @@ -2517,8 +2520,10 @@ static void pshader_glsl_texdp3tex(const SHADER_OPCODE_ARG *arg) sprintf(coord_param, "vec3(dot(gl_TexCoord[%u].xyz, %s), 0.0, 0.0)", sampler_idx, src0_param.param_str); break; + default: - FIXME("Unexpected mask bitcount %d\n", count_bits(sample_function.coord_mask)); + FIXME("Unexpected mask size %u\n", mask_size); + break; } shader_glsl_gen_sample_code(arg, sampler_idx, coord_param, &sample_function, WINED3DVS_NOSWIZZLE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 846a15a..add283a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2099,7 +2099,6 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize /* Math utils */ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); -unsigned int count_bits(unsigned int mask); UINT wined3d_log2i(UINT32 x); /* TODO: Make this dynamic, based on shader limits ? */

1 0