September 2007 - Wine-commits

Stefan Dösinger : wined3d: Add dp2add support to arb shaders.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 1407bdb2cfa05cf1985066f1570d2c7a718c837c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1407bdb2cfa05cf1985066f15… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 16:46:12 2007 +0200 wined3d: Add dp2add support to arb shaders. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 419d485..4d7dd58 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -878,6 +878,33 @@ void pshader_hw_cmp(SHADER_OPCODE_ARG* arg) { pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); } +/** Process the WINED3DSIO_DP2ADD instruction in ARB. + * dst = dot2(src0, src1) + src2 */ +void pshader_hw_dp2add(SHADER_OPCODE_ARG* arg) { + SHADER_BUFFER* buffer = arg->buffer; + char dst_wmask[20]; + char dst_name[50]; + char src_name[3][50]; + DWORD shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + BOOL sat = (arg->dst & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + + pshader_get_register_name(arg->dst, dst_name); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0]); + pshader_gen_input_modifier_line(buffer, arg->src[1], 1, src_name[1]); + pshader_gen_input_modifier_line(buffer, arg->src[2], 2, src_name[2]); + + /* Emulate a DP2 with a DP3 and 0.0 */ + shader_addline(buffer, "MOV TMP, %s;\n", src_name[0]); + shader_addline(buffer, "MOV TMP.z, 0.0;\n"); + shader_addline(buffer, "DP3 TMP2, TMP, %s;\n", src_name[1]); + shader_addline(buffer, "ADD%s %s%s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[2]); + + if (shift != 0) + pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); +} + /* Map the opcode 1-to-1 to the GL code */ void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 2d89bad..10fb732 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -189,8 +189,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_NRM, "nrm", NULL, 1, 2, NULL, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, NULL, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, NULL, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, - /* TODO: dp2add can be made out of multiple instuctions */ - {WINED3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 1, 4, NULL, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, + {WINED3DSIO_DP2ADD, "dp2add", NULL, 1, 4, pshader_hw_dp2add, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, /* Matrix */ {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8844ffa..70d44e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1786,6 +1786,7 @@ extern void pshader_hw_texdp3tex(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texdp3(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texm3x3(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg); +extern void pshader_hw_dp2add(SHADER_OPCODE_ARG* arg); /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg);

1 0

Jacek Caban : mshtml: Added IHTMLDocument5 interface stub implementation.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 9ba65105d54224cd9551819189a6946e7ccd014f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba65105d54224cd955181918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:43:52 2007 +0200 mshtml: Added IHTMLDocument5 interface stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmldoc.c | 4 + dlls/mshtml/htmldoc5.c | 261 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + 4 files changed, 269 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ba65105d54224cd95518…

1 0

Jacek Caban : mshtml: Added get_compatMode implementation.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: cb776f7d5bd221119bc785e240f1b56450a78ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb776f7d5bd221119bc785e24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:44:14 2007 +0200 mshtml: Added get_compatMode implementation. --- dlls/mshtml/htmldoc5.c | 30 ++++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index a91118e..95d76f3 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -220,8 +220,34 @@ static HRESULT WINAPI HTMLDocument5_get_onbeforedeactivate(IHTMLDocument5 *iface static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *p) { HTMLDocument *This = HTMLDOC5_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + nsIDOMNSHTMLDocument *nshtmldoc; + nsAString mode_str; + const PRUnichar *mode; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) + ERR("GetDocument failed: %08x\n", nsres); + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNSHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLDocument: %08x\n", nsres); + return S_OK; + } + + nsAString_Init(&mode_str, NULL); + nsIDOMNSHTMLDocument_GetCompatMode(nshtmldoc, &mode_str); + nsIDOMNSHTMLDocument_Release(nshtmldoc); + + nsAString_GetData(&mode_str, &mode, NULL); + *p = SysAllocString(mode); + nsAString_Finish(&mode_str); + + return S_OK; } #undef HTMLDOC5_THIS diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c79b17e..1d36197 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -836,6 +836,50 @@ interface nsIDOMHTMLDocument : nsIDOMDocument [ object, + uuid(79beb289-3644-4b54-9432-9fb993945629) + /* NOT_FROZEN */ +] +interface nsIDOMNSHTMLDocument : nsISupports +{ + nsresult GetWidth(PRInt32 *aWidth); + nsresult GetHeight(PRInt32 *aHeight); + nsresult GetAlinkColor(nsAString *aAlinkColor); + nsresult SetAlinkColor(const nsAString *aAlinkColor); + nsresult GetLinkColor(nsAString *aLinkColor); + nsresult SetLinkColor(const nsAString *aLinkColor); + nsresult GetVlinkColor(nsAString *aVlinkColor); + nsresult SetVlinkColor(const nsAString *aVlinkColor); + nsresult GetBgColor(nsAString *aBgColor); + nsresult SetBgColor(const nsAString *aBgColor); + nsresult GetFgColor(nsAString *aFgColor); + nsresult SetFgColor(const nsAString *aFgColor); + nsresult GetDomain(nsAString *aDomain); + nsresult SetDomain(const nsAString *aDomain); + nsresult GetEmbeds(nsIDOMHTMLCollection **aEmbeds); + nsresult GetSelection(nsAString *_retval); + nsresult Open(nsIDOMDocument **_retval); + nsresult Write(); + nsresult Writeln(); + nsresult Clear(); + nsresult CaptureEvents(PRInt32 eventFlags); + nsresult ReleaseEvents(PRInt32 eventFlags); + nsresult RouteEvent(nsIDOMEvent *evt); + nsresult GetCompatMode(nsAString *aCompatMode); + nsresult GetPlugins(nsIDOMHTMLCollection **aPlugins); + nsresult GetDesignMode(nsAString *aDesignMode); + nsresult SetDesignMode(const nsAString *aDesignMode); + nsresult ExecCommand(const nsAString *commandID, PRBool doShowUI, const nsAString *value, PRBool *_retval); + nsresult ExecCommandShowHelp(const nsAString *commandID, PRBool *_retval); + nsresult QueryCommandEnabled(const nsAString *commandID, PRBool *_retval); + nsresult QueryCommandIndeterm(const nsAString *commandID, PRBool *_retval); + nsresult QueryCommandState(const nsAString *commandID, PRBool *_retval); + nsresult QueryCommandSupported(const nsAString *commandID, PRBool *_retval); + nsresult QueryCommandText(const nsAString *commandID, nsAString *_retval); + nsresult QueryCommandValue(const nsAString *commandID, nsAString *_retval); +} + +[ + object, uuid(3d9f4973-dd2e-48f5-b5f7-2634e09eadd9) /* FROZEN */ ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 80675f5..3c7a18a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -347,6 +347,24 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(body_range); } +static void test_compatmode(IHTMLDocument2 *doc) +{ + IHTMLDocument5 *doc5; + BSTR mode; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + ok(hres == S_OK, "Could not get IHTMLDocument5 interface: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLDocument5_get_compatMode(doc5, &mode); + IHTMLDocument5_Release(doc5); + ok(hres == S_OK, "get_compatMode failed: %08x\n", hres); + ok(!strcmp_wa(mode, "BackCompat"), "compatMode=%s\n", dbgstr_w(mode)); + SysFreeString(mode); +} + static void test_default_style(IHTMLStyle *style) { VARIANT_BOOL b; @@ -431,6 +449,7 @@ static void test_defaults(IHTMLDocument2 *doc) ok(hres == S_OK, "get_style failed: %08x\n", hres); test_default_style(style); + test_compatmode(doc); IHTMLStyle_Release(style);

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: put_scrollTop and put_scrollLeft implementation.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 0a0d72ac5d5bc3a5943eefdd78360051bb5b0b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0d72ac5d5bc3a5943eefdd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:44:37 2007 +0200 mshtml: Added IHTMLElement2::put_scrollTop and put_scrollLeft implementation. --- dlls/mshtml/htmlelem2.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 5b25086..1d1fcfa 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -626,8 +626,20 @@ static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, long *p static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%ld)\n", This, v); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsresult nsres; + + TRACE("(%p)->(%ld)\n", This, v); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_SetScrollTop(nselem, v); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + return S_OK; } static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, long *p) @@ -640,8 +652,20 @@ static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsresult nsres; + + TRACE("(%p)->(%ld)\n", This, v); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_SetScrollLeft(nselem, v); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + return S_OK; } static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, long *p)

1 0

Jacek Caban : mshtml: Forward IHTMLTextContainer:: put_scrollTop and put_scrollLeft calls to IHTMLElement2 interface.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: e27f1854401abed773c3cb498fb76c829214c921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27f1854401abed773c3cb498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:44:54 2007 +0200 mshtml: Forward IHTMLTextContainer::put_scrollTop and put_scrollLeft calls to IHTMLElement2 interface. --- dlls/mshtml/htmltextcont.c | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 20bdeab..07c0081 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -147,21 +147,10 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, long v) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - nsIDOMNSHTMLElement *nselem; - nsresult nsres; TRACE("(%p)->(%ld)\n", This, v); - nsres = nsIDOMHTMLElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, - (void**)&nselem); - if(NS_SUCCEEDED(nsres)) { - nsIDOMNSHTMLElement_SetScrollTop(nselem, v); - nsIDOMNSHTMLElement_Release(nselem); - }else { - ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); - } - - return S_OK; + return IHTMLElement2_put_scrollTop(HTMLELEM2(&This->element), v); } static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, long *p) @@ -174,21 +163,10 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, long v) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - nsIDOMNSHTMLElement *nselem; - nsresult nsres; TRACE("(%p)->(%ld)\n", This, v); - nsres = nsIDOMHTMLElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, - (void**)&nselem); - if(NS_SUCCEEDED(nsres)) { - nsIDOMNSHTMLElement_SetScrollLeft(nselem, v); - nsIDOMNSHTMLElement_Release(nselem); - }else { - ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); - } - - return S_OK; + return IHTMLElement2_put_scrollLeft(HTMLELEM2(&This->element), v); } static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, long *p)

1 0

Jacek Caban : mshtml: Ignore app' s User-Agent header and Content-Type if there is no data to post.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 8966cfe42ad09c5bf7c3792ce1df6af1d2c283f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8966cfe42ad09c5bf7c3792ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:45:09 2007 +0200 mshtml: Ignore app's User-Agent header and Content-Type if there is no data to post. --- dlls/mshtml/persist.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 9f74c91..abee743 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -39,6 +39,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define USER_AGENT "User-Agent:" +#define CONTENT_TYPE "Content-Type:" + +static int fix_headers(char *buf, DWORD post_len) +{ + char *ptr = NULL; + + if(!strncasecmp(USER_AGENT, buf, sizeof(USER_AGENT)-1)) { + ptr = buf; + }else { + ptr = strstr(buf, "\r\n" USER_AGENT); + if(ptr) + ptr += 2; + } + + if(ptr) { + const char *ptr2; + + FIXME("Ignoring User-Agent header\n"); + + ptr2 = strstr(ptr, "\r\n"); + if(ptr2) + memmove(ptr, ptr2, strlen(ptr2)+1); + } + + if(!post_len) { + if(!strncasecmp(CONTENT_TYPE, buf, sizeof(CONTENT_TYPE)-1)) { + ptr = buf; + }else { + ptr = strstr(buf, "\r\n" CONTENT_TYPE); + if(ptr) + ptr += 2; + } + + if(ptr) { + const char *ptr2; + + TRACE("Ignoring Content-Type header\n"); + + ptr2 = strstr(ptr, "\r\n"); + if(ptr2) + memmove(ptr, ptr2, strlen(ptr2)+1); + } + } + + return strlen(buf); +} + static nsIInputStream *get_post_data_stream(IBindCtx *bctx) { nsIInputStream *ret = NULL; @@ -84,7 +132,7 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) post_len = bindinfo.cbstgmedData; if(headers_len || post_len) { - int len = headers_len ? headers_len-1 : 0; + int len = 0; static const char content_length[] = "Content-Length: %u\r\n\r\n"; @@ -93,9 +141,13 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) if(headers_len) { WideCharToMultiByte(CP_ACP, 0, headers, -1, data, -1, NULL, NULL); CoTaskMemFree(headers); + len = fix_headers(data, post_len); } if(post_len) { + if(len >= 4 && !strcmp(data+len-4, "\r\n\r\n")) + len -= 2; + sprintf(data+len, content_length, post_len); len = strlen(data);

1 0

Jacek Caban : mshtml: Added IDM_COPY in browse mode implementation.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 124f0290e415fceae415d56f0d57431639a6d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=124f0290e415fceae415d56f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:45:31 2007 +0200 mshtml: Added IDM_COPY in browse mode implementation. --- dlls/mshtml/editor.c | 30 ------------------------------ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/olecmd.c | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 4dc4c08..6cfd20b 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -99,36 +99,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR wszFont[] = {'f','o','n','t',0}; static const WCHAR wszSize[] = {'s','i','z','e',0}; -static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam) -{ - nsICommandManager *cmdmgr; - nsIInterfaceRequestor *iface_req; - nsresult nsres; - - TRACE("(%p)\n", This); - - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, - (void**)&cmdmgr); - nsIInterfaceRequestor_Release(iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsICommandManager: %08x\n", nsres); - return; - } - - nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL); - if(NS_FAILED(nsres)) - ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); - - nsICommandManager_Release(cmdmgr); -} - static void do_ns_editor_command(NSContainer *This, const char *cmd) { nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 69fc70d..54eb810 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -441,6 +441,8 @@ typedef struct { extern const cmdtable_t editmode_cmds[]; +void do_ns_command(NSContainer*,const char*,nsICommandParams*); + /* timer */ #define UPDATE_UI 0x0001 #define UPDATE_TITLE 0x0002 diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 88c456a..458209c 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" +#define NSCMD_COPY "cmd_copy" #define NSCMD_ITALIC "cmd_italic" #define NSCMD_UNDERLINE "cmd_underline" #define NSCMD_ALIGN "cmd_align" @@ -57,6 +58,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSALIGN_LEFT "left" #define NSALIGN_RIGHT "right" +void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam) +{ + nsICommandManager *cmdmgr; + nsIInterfaceRequestor *iface_req; + nsresult nsres; + + TRACE("(%p)\n", This); + + nsres = nsIWebBrowser_QueryInterface(This->webbrowser, + &IID_nsIInterfaceRequestor, (void**)&iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); + return; + } + + nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, + (void**)&cmdmgr); + nsIInterfaceRequestor_Release(iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsICommandManager: %08x\n", nsres); + return; + } + + nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL); + if(NS_FAILED(nsres)) + ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); + + nsICommandManager_Release(cmdmgr); +} + /********************************************************** * IOleCommandTarget implementation */ @@ -474,8 +505,8 @@ static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i if(This->usermode == EDITMODE) return editor_exec_copy(This, cmdexecopt, in, out); - FIXME("Unimplemented in browse mode\n"); - return E_NOTIMPL; + do_ns_command(This->nscontainer, NSCMD_COPY, NULL); + return S_OK; } static HRESULT query_mshtml_cut(HTMLDocument *This, OLECMD *cmd)

1 0

Jacek Caban : hlink: Added HlinkGetSpecialReference stub.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: e805fe50bc449f598e20e365231e3b7575348736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e805fe50bc449f598e20e3652… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 19:45:27 2007 +0200 hlink: Added HlinkGetSpecialReference stub. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 65ffd97..e5ab631 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -14,7 +14,7 @@ 18 stub HlinkParseDisplayName 20 stdcall HlinkQueryCreateFromData(ptr) 21 stub HlinkSetSpecialReference -22 stub HlinkGetSpecialReference +22 stdcall HlinkGetSpecialReference(long ptr) 23 stub HlinkCreateShortcut 24 stub HlinkResolveShortcut 25 stdcall HlinkIsShortcut(wstr) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 91ecb77..b0b407a 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -276,6 +276,12 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) return strcmpiW(pwzFileName+len, url_ext) ? S_FALSE : S_OK; } +HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) +{ + FIXME("(%u %p) stub\n", uReference, ppwzReference); + return E_NOTIMPL; +} + HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) { FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL);

1 0

Michael Stefaniuc : crypt32: Add missing parameter to a TRACE.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: a624fb044c3d4184751add8082c7ef6c5998a53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a624fb044c3d4184751add808… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Sep 26 18:57:38 2007 +0200 crypt32: Add missing parameter to a TRACE. --- dlls/crypt32/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index e12ace3..5dc6341 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -466,6 +466,6 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); } - TRACE("returning %d\n"); + TRACE("returning %d\n", ret); return ret; }

1 0

Maarten Lankhorst : dsound: Check if hardware buffer is big enough before accepting it.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 6506dff8b89a04040f5a09fb2994031cf3ed6965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6506dff8b89a04040f5a09fb2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 25 14:19:07 2007 +0200 dsound: Check if hardware buffer is big enough before accepting it. --- dlls/dsound/primary.c | 48 +++++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index a27ee14..359a5ac 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -133,9 +133,19 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { + DWORD buflen; HRESULT err = DS_OK; TRACE("(%p)\n", device); + /* on original windows, the buffer it set to a fixed size, no matter what the settings are. + on windows this size is always fixed (tested on win-xp) */ + if (!device->buflen) + buflen = ds_hel_buflen; + else /* In case we move from hw accelerated to waveout */ + buflen = device->buflen; + buflen -= buflen % device->pwfx->nBlockAlign; + device->buflen = buflen; + if (device->driver) { err = IDsDriver_CreateSoundBuffer(device->driver,device->pwfx, @@ -152,6 +162,21 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) return err; } } + DSOUND_RecalcPrimary(device); + device->prebuf = ds_snd_queue_max; + if (device->helfrags < ds_snd_queue_min) + { + WARN("Too little sound buffer to be effective (%d/%d) falling back to waveout\n", device->buflen, ds_snd_queue_min * device->fraglen); + device->buflen = buflen; + err = DSOUND_ReopenDevice(device, TRUE); + if (FAILED(err)) + { + WARN("Falling back to waveout failed too! Giving up\n"); + return err; + } + } + else if (device->helfrags < ds_snd_queue_max) + device->prebuf = device->helfrags; } if (device->state == STATE_PLAYING) device->state = STATE_STARTING; @@ -161,27 +186,19 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) if (!device->driver) { LPBYTE newbuf; LPWAVEHDR headers = NULL; - DWORD buflen, overshot, oldbuflen; + DWORD overshot; unsigned int c; /* Start in pause mode, to allow buffers to get filled */ waveOutPause(device->hwo); - /* on original windows, the buffer it set to a fixed size, no matter what the settings are. - on windows this size is always fixed (tested on win-xp) */ - if (!device->buflen) - buflen = ds_hel_buflen; - else /* In case we move from hw accelerated to waveout */ - buflen = device->buflen; - buflen -= buflen % device->pwfx->nBlockAlign; - TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); /* reallocate emulated primary buffer */ if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer,buflen); + newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer, buflen); else - newbuf = HeapAlloc(GetProcessHeap(),0,buflen); + newbuf = HeapAlloc(GetProcessHeap(),0, buflen); if (!newbuf) { ERR("failed to allocate primary buffer\n"); @@ -189,8 +206,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* but the old buffer might still exist and must be re-prepared */ } - oldbuflen = device->buflen; - device->buflen = buflen; DSOUND_RecalcPrimary(device); if (device->pwave) headers = HeapReAlloc(GetProcessHeap(),0,device->pwave, device->helfrags * sizeof(WAVEHDR)); @@ -200,7 +215,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) if (!headers) { ERR("failed to allocate wave headers\n"); HeapFree(GetProcessHeap(), 0, newbuf); - device->buflen = oldbuflen; DSOUND_RecalcPrimary(device); return DSERR_OUTOFMEMORY; } @@ -228,17 +242,13 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) if(overshot) { overshot -= overshot % device->pwfx->nBlockAlign; - if (overshot) - WARN("helfrags (%d x %d) doesn't fit entirely in buflen (%d) overshot: %d\n", device->helfrags, device->fraglen, device->buflen, overshot); device->pwave[device->helfrags - 1].dwBufferLength += overshot; } - TRACE("fraglen=%d\n", device->fraglen); + TRACE("fraglen=%d, overshot=%d\n", device->fraglen, overshot); } FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); device->pwplay = device->pwqueue = device->playpos = device->mixpos = 0; - DSOUND_RecalcPrimary(device); - return err; }

1 0