September 2010 - Wine-commits

Wolfram Sang : hhctrl: Add check for no filename.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 9e1d9ef972f65e292e7b00e1da9293271bc60486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d9ef972f65e292e7b00e1d… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Sep 8 16:23:47 2010 +0200 hhctrl: Add check for no filename. --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 9ab66de..2101e05 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) ptr += strlen("mapid")+1; space = strchr(ptr, ' '); + /* command line ends without number */ + if (!space) + return 0; memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; mapid = atoi(idtxt); @@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) len = endq - szCmdLine; else len = strlen(szCmdLine); + + /* no filename given */ + if (!len) + return 0; + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; filename = heap_alloc(buflen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);

1 0

Joris Huizer : wined3d: Fix typo in checkGLcall.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 2fd50cb4b8ccc033c714676cd9421da7170d25da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd50cb4b8ccc033c714676cd… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Sep 8 21:50:02 2010 +0200 wined3d: Fix typo in checkGLcall. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c04b317..f6249ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3915,7 +3915,7 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f); - checkGLcall("glTranslatef(63.0f / 128.0f, -63.0f / 128.0f, 0.0f)"); + checkGLcall("glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f)"); } else {

1 0

Joris Huizer : msxml3: Fix copy/paste error in get_lastChild functions.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 37f61acb7703c67d2ad96a4a01f01f11869560df URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f61acb7703c67d2ad96a4a0… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Sep 8 21:55:37 2010 +0200 msxml3: Fix copy/paste error in get_lastChild functions. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/node.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index e96cb6e..f1b7643 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -263,7 +263,7 @@ static HRESULT WINAPI domattr_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI domattr_get_previousSibling( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 801d2a9..7b97050 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -269,7 +269,7 @@ static HRESULT WINAPI domfrag_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI domfrag_get_previousSibling( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 35a8f7c..c66ea74 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -779,7 +779,7 @@ static HRESULT WINAPI domdoc_get_lastChild( TRACE("(%p)->(%p)\n", This, lastChild); - return node_get_first_child(&This->node, lastChild); + return node_get_last_child(&This->node, lastChild); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index fa9b18d..1cce5e1 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -278,7 +278,7 @@ static HRESULT WINAPI domelem_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI domelem_get_previousSibling( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index b1217b2..57e6683 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -265,7 +265,7 @@ static HRESULT WINAPI entityref_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI entityref_get_previousSibling( diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f37b081..921ef15 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1844,7 +1844,7 @@ static HRESULT WINAPI unknode_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI unknode_get_previousSibling(

1 0

André Hentschel : winedbg: Fix typo in German translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 7bf924f67218cdf18a73ca9bc3113ddd38dc7190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf924f67218cdf18a73ca9bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 21:55:26 2010 +0200 winedbg: Fix typo in German translation. --- programs/winedbg/rsrc_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc index 360f156..a02ea68 100644 --- a/programs/winedbg/rsrc_De.rc +++ b/programs/winedbg/rsrc_De.rc @@ -51,7 +51,7 @@ END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "Wine Programm absturz" + IDS_AUTO_CAPTION "Wine Programm Absturz" IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" IDS_UNIDENTIFIED "(unbekannt)" END

1 0

Jacek Caban : urlmon: Correctly handle INET_E_USE_DEFAULT_SETTING returned from GetBindString( BINDIND_ACCEPT_MIMES).
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: ed2b72248fef1880e176e88ca46e03cc5769c8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2b72248fef1880e176e88ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 14:56:08 2010 +0200 urlmon: Correctly handle INET_E_USE_DEFAULT_SETTING returned from GetBindString(BINDIND_ACCEPT_MIMES). --- dlls/urlmon/http.c | 13 +++++++++++-- include/urlmon.idl | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index fc0b8c4..04ca232 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -76,6 +76,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ IHttpNegotiate2 *http_negotiate2 = NULL; LPWSTR host, user, pass, path; LPOLESTR accept_mimes[257]; + const WCHAR **accept_types; URL_COMPONENTSW url_comp; BYTE security_id[512]; DWORD len = 0; @@ -113,7 +114,15 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ num = sizeof(accept_mimes)/sizeof(accept_mimes[0])-1; hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ACCEPT_MIMES, accept_mimes, num, &num); - if(hres != S_OK) { + if(hres == INET_E_USE_DEFAULT_SETTING) { + static const WCHAR default_accept_mimeW[] = {'*','/','*',0}; + static const WCHAR *default_accept_mimes[] = {default_accept_mimeW, NULL}; + + accept_types = default_accept_mimes; + num = 0; + }else if(hres == S_OK) { + accept_types = (const WCHAR**)accept_mimes; + }else { WARN("GetBindString BINDSTRING_ACCEPT_MIMES failed: %08x\n", hres); return INET_E_NO_VALID_MEDIA; } @@ -130,7 +139,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ This->base.request = HttpOpenRequestW(This->base.connection, This->base.bind_info.dwBindVerb < BINDVERB_CUSTOM ? wszBindVerb[This->base.bind_info.dwBindVerb] : This->base.bind_info.szCustomVerb, - path, NULL, NULL, (LPCWSTR *)accept_mimes, request_flags, (DWORD_PTR)&This->base); + path, NULL, NULL, accept_types, request_flags, (DWORD_PTR)&This->base); heap_free(path); while(num--) CoTaskMemFree(accept_mimes[num]); diff --git a/include/urlmon.idl b/include/urlmon.idl index c1d3bec..ac856e8 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1897,6 +1897,7 @@ cpp_quote("#define INET_E_SECURITY_PROBLEM _HRESULT_TYPEDEF_(0x800C000E cpp_quote("#define INET_E_CANNOT_LOAD_DATA _HRESULT_TYPEDEF_(0x800C000F)") cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT _HRESULT_TYPEDEF_(0x800C0010)") cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER _HRESULT_TYPEDEF_(0x800C0011)") +cpp_quote("#define INET_E_USE_DEFAULT_SETTING _HRESULT_TYPEDEF_(0x800C0012L)") cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN _HRESULT_TYPEDEF_(0x800C0013)") cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)")

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_childNode implementations.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: c8b15e90bd2eb17c99885a148a15dae8f2e3e946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b15e90bd2eb17c99885a148… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 15:12:02 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_childNode implementations. --- dlls/msxml3/attribute.c | 5 ++++- dlls/msxml3/cdata.c | 5 ++++- dlls/msxml3/comment.c | 5 ++++- dlls/msxml3/docfrag.c | 5 ++++- dlls/msxml3/domdoc.c | 5 ++++- dlls/msxml3/element.c | 5 ++++- dlls/msxml3/entityref.c | 5 ++++- dlls/msxml3/msxml_private.h | 2 ++ dlls/msxml3/node.c | 27 ++++++++++++++++----------- dlls/msxml3/pi.c | 5 ++++- dlls/msxml3/text.c | 5 ++++- 11 files changed, 54 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index aa0f2d0..9a0394d 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -238,7 +238,10 @@ static HRESULT WINAPI domattr_get_childNodes( IXMLDOMNodeList** outList) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domattr_get_firstChild( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 56c2695..902fe26 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -249,7 +249,10 @@ static HRESULT WINAPI domcdata_get_childNodes( IXMLDOMNodeList** outList) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domcdata_get_firstChild( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3a30d6c..8763864 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -242,7 +242,10 @@ static HRESULT WINAPI domcomment_get_childNodes( IXMLDOMNodeList** outList) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domcomment_get_firstChild( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5bc8e4b..ed8b6c5 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -244,7 +244,10 @@ static HRESULT WINAPI domfrag_get_childNodes( IXMLDOMNodeList** outList) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domfrag_get_firstChild( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f2a7ad6..f7400f4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -752,7 +752,10 @@ static HRESULT WINAPI domdoc_get_childNodes( IXMLDOMNodeList** childList ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), childList ); + + TRACE("(%p)->(%p)\n", This, childList); + + return node_get_child_nodes(&This->node, childList); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 3d6228d..c7c8d45 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -253,7 +253,10 @@ static HRESULT WINAPI domelem_get_childNodes( IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domelem_get_firstChild( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 9fb9ab3..3b8ae53 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -240,7 +240,10 @@ static HRESULT WINAPI entityref_get_childNodes( IXMLDOMNodeList** outList) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI entityref_get_firstChild( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index f54e9ae..8964818 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -163,6 +163,8 @@ extern HRESULT node_get_nodeName(xmlnode*,BSTR*); extern HRESULT node_get_content(xmlnode*,VARIANT*); extern HRESULT node_put_value(xmlnode*,VARIANT*); extern HRESULT node_get_parent(xmlnode*,IXMLDOMNode**); +extern HRESULT node_get_child_nodes(xmlnode*,IXMLDOMNodeList**); + extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7bcbe12..aa494c4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -293,24 +293,26 @@ static HRESULT WINAPI xmlnode_get_parentNode( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_childNodes( - IXMLDOMNode *iface, - IXMLDOMNodeList** childList) +HRESULT node_get_child_nodes(xmlnode *This, IXMLDOMNodeList **ret) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - - TRACE("(%p)->(%p)\n", This, childList ); - - if ( !childList ) + if(!ret) return E_INVALIDARG; - *childList = create_children_nodelist(This->node); - if (*childList == NULL) + *ret = create_children_nodelist(This->node); + if(!*ret) return E_OUTOFMEMORY; return S_OK; } +static HRESULT WINAPI xmlnode_get_childNodes( + IXMLDOMNode *iface, + IXMLDOMNodeList** childList) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI xmlnode_get_firstChild( IXMLDOMNode *iface, IXMLDOMNode** firstChild) @@ -1825,7 +1827,10 @@ static HRESULT WINAPI unknode_get_childNodes( IXMLDOMNodeList** outList) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI unknode_get_firstChild( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 95f3327..20e6bd6 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -255,7 +255,10 @@ static HRESULT WINAPI dom_pi_get_childNodes( IXMLDOMNodeList** outList) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI dom_pi_get_firstChild( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 48801d6..5891814 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -255,7 +255,10 @@ static HRESULT WINAPI domtext_get_childNodes( IXMLDOMNodeList** outList) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domtext_get_firstChild(

1 0

Jacek Caban : msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[ first|last]Node implementations.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 4f210e21a5b112c3f733bb5c084cdb4a116574ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f210e21a5b112c3f733bb5c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 15:12:14 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[first|last]Node implementations. --- dlls/msxml3/attribute.c | 10 +++++++- dlls/msxml3/cdata.c | 10 +++++++- dlls/msxml3/comment.c | 10 +++++++- dlls/msxml3/docfrag.c | 10 +++++++- dlls/msxml3/domdoc.c | 10 +++++++- dlls/msxml3/element.c | 10 +++++++- dlls/msxml3/entityref.c | 10 +++++++- dlls/msxml3/msxml_private.h | 10 +++++++++ dlls/msxml3/node.c | 46 ++++++++++++++++++++---------------------- dlls/msxml3/pi.c | 10 +++++++- dlls/msxml3/text.c | 10 +++++++- 11 files changed, 104 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f210e21a5b112c3f733b…

1 0

Jason Edmeades : cmd: echo.word should echo back the word without the .
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 32c8b46633f0fe5d31d68573ed23f3bf761a8c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c8b46633f0fe5d31d68573e… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 7 15:59:43 2010 -0700 cmd: echo.word should echo back the word without the . --- programs/cmd/builtins.c | 9 +++------ programs/cmd/tests/test_builtins.cmd | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a4f9a1..5ccbb8f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -668,15 +668,12 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { void WCMD_echo (const WCHAR *command) { int count; + const WCHAR *origcommand = command; - if ((command[0] == '.') && (command[1] == 0)) { - WCMD_output (newline); - return; - } - if (command[0]==' ') + if (command[0]==' ' || command[0]=='.') command++; count = strlenW(command); - if (count == 0) { + if (count == 0 && origcommand[0]!='.') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d596c18..d9f5cf7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -9,6 +9,8 @@ echo "doublequotedword" echo "/?" echo. echo . +echo.word +echo .word echo ------------ Testing 'set' -------------- echo set "FOO=bar" should not include the quotes in the variable value diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 306953b..8942cb3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -9,6 +9,8 @@ at-echoed-word "/?" . +word +.word ------------ Testing 'set' -------------- set "FOO=bar" should not include the quotes in the variable value bar

1 0

Roderick Colenbrander : include: Undefine INTERFACE before defining it.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 6154bf1ad85114f1ede62dd7b199c0b74495c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6154bf1ad85114f1ede62dd7b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Sep 8 00:20:12 2010 +0200 include: Undefine INTERFACE before defining it. --- include/d3d.h | 1 + include/d3d8.h | 1 + include/d3d9.h | 1 + include/ddraw.h | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 7297755..409be1b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -202,6 +202,7 @@ typedef DWORD D3DVIEWPORTHANDLE, *LPD3DVIEWPORTHANDLE; /***************************************************************************** * IDirect3D interface */ +#undef INTERFACE #define INTERFACE IDirect3D DECLARE_INTERFACE_(IDirect3D,IUnknown) { diff --git a/include/d3d8.h b/include/d3d8.h index 46e0812..88da40d 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -129,6 +129,7 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU /***************************************************************************** * IDirect3D8 interface */ +#undef INTERFACE #define INTERFACE IDirect3D8 DECLARE_INTERFACE_(IDirect3D8,IUnknown) { diff --git a/include/d3d9.h b/include/d3d9.h index 09ce3d0..3f9ebf2 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -163,6 +163,7 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9; /***************************************************************************** * IDirect3D9 interface */ +#undef INTERFACE #define INTERFACE IDirect3D9 DECLARE_INTERFACE_(IDirect3D9,IUnknown) { diff --git a/include/ddraw.h b/include/ddraw.h index eea7e09..88990f0 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1220,6 +1220,7 @@ typedef struct tagDDDEVICEIDENTIFIER2 { /***************************************************************************** * IDirectDrawPalette interface */ +#undef INTERFACE #define INTERFACE IDirectDrawPalette DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown) {

1 0

Hans Leidekker : dnsapi: Remove the critical section around res_query.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 18cd143086ef040f9322b0b9b017cb47a0a6946f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18cd143086ef040f9322b0b9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 19:26:43 2010 +0200 dnsapi: Remove the critical section around res_query. --- dlls/dnsapi/query.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6014465..8de33e6 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -52,19 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); #ifdef HAVE_RESOLV -static CRITICAL_SECTION resolver_cs; -static CRITICAL_SECTION_DEBUG resolver_cs_debug = -{ - 0, 0, &resolver_cs, - { &resolver_cs_debug.ProcessLocksList, - &resolver_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": resolver_cs") } -}; -static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; - -#define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) -#define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) - /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* call once per thread on systems that have per-thread _res */ static void initialise_resolver( void ) @@ -552,8 +539,7 @@ exit: return status; } -/* The resolver lock must be held and res_init() must have been - * called before calling these three functions. +/* res_init() must have been called before calling these three functions. */ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { @@ -704,16 +690,11 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - LOCK_RESOLVER(); - initialise_resolver(); _res.options |= dns_map_options( options ); if (servers && (ret = dns_set_serverlist( servers ))) - { - UNLOCK_RESOLVER(); return ret; - } ret = dns_do_query( name, type, options, result ); @@ -724,8 +705,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser ret = dns_do_query_netbios( name, result ); } - UNLOCK_RESOLVER(); - #endif return ret; } @@ -822,12 +801,8 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigDnsServerList: { #ifdef HAVE_RESOLV - LOCK_RESOLVER(); - initialise_resolver(); ret = dns_get_serverlist( buffer, len ); - - UNLOCK_RESOLVER(); break; #else WARN( "compiled without resolver support\n" );

1 0