wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

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

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

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

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 : 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

Damjan Jovanovic : windowscodecs: Test that ICO GetSize returns the BITMAPINFOHEADER size instead of the ICONDIRENTRY size .
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: f68333cb6b35fe19421e856f5f1103a3b1aee2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68333cb6b35fe19421e856f5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 8 09:45:37 2010 +0200 windowscodecs: Test that ICO GetSize returns the BITMAPINFOHEADER size instead of the ICONDIRENTRY size. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/icoformat.c | 159 ++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index e274d3c..165f935 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = ole32 windowscodecs C_SRCS = \ bmpformat.c \ converter.c \ + icoformat.c \ info.c \ palette.c \ stream.c diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c new file mode 100644 index 0000000..dc34f40 --- /dev/null +++ b/dlls/windowscodecs/tests/icoformat.c @@ -0,0 +1,159 @@ +/* + * Copyright 2010 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <math.h> + +#define COBJMACROS + +#include "windef.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static unsigned char testico_bad_icondirentry_size[] = { + /* ICONDIR */ + 0, 0, /* reserved */ + 1, 0, /* type */ + 1, 0, /* count */ + /* ICONDIRENTRY */ + 2, /* width */ + 2, /* height */ + 2, /* colorCount */ + 0, /* reserved */ + 1,0, /* planes */ + 8,0, /* bitCount */ + (40+2*4+16*16+16*4) & 0xFF,((40+2*4+16*16+16*4) >> 8) & 0xFF,0,0, /* bytesInRes */ + 22,0,0,0, /* imageOffset */ + /* BITMAPINFOHEADER */ + 40,0,0,0, /* header size */ + 16,0,0,0, /* width */ + 2*16,0,0,0, /* height (XOR+AND rows) */ + 1,0, /* planes */ + 8,0, /* bit count */ + 0,0,0,0, /* compression */ + 0,0,0,0, /* sizeImage */ + 0,0,0,0, /* x pels per meter */ + 0,0,0,0, /* y pels per meter */ + 2,0,0,0, /* clrUsed */ + 0,0,0,0, /* clrImportant */ + /* palette */ + 0,0,0,0, + 0xFF,0xFF,0xFF,0, + /* XOR mask */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, + 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, + 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + /* AND mask */ + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0 +}; + +static void test_bad_icondirentry_size(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + IWICStream *icostream; + IWICBitmapFrameDecode *framedecode = NULL; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateStream(factory, &icostream); + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromMemory(icostream, testico_bad_icondirentry_size, + sizeof(testico_bad_icondirentry_size)); + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(&CLSID_WICIcoDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, + WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + UINT width = 0, height = 0; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); + todo_wine ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + IWICBitmapFrameDecode_Release(framedecode); + } + + IWICBitmapDecoder_Release(decoder); + } + + IWICStream_Release(icostream); + } + + IWICImagingFactory_Release(factory); +} + +START_TEST(icoformat) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_bad_icondirentry_size(); + + CoUninitialize(); +}

1 0

Jason Edmeades : cmd: Make tests supply stderr + more diagnostics.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 199b2db50209e9aecb51b6f5fa04f9e38de45940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199b2db50209e9aecb51b6f5f… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 7 15:59:41 2010 -0700 cmd: Make tests supply stderr + more diagnostics. --- programs/cmd/tests/batch.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9e93a01..cc8c020 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -31,7 +31,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) char command[] = "test.cmd"; STARTUPINFOA si = {sizeof(si)}; PROCESS_INFORMATION pi; - HANDLE file; + HANDLE file,fileerr; DWORD size; BOOL bres; @@ -53,8 +53,15 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) if(file == INVALID_HANDLE_VALUE) return FALSE; + fileerr = CreateFileA("test.err", GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, &sa, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(fileerr != INVALID_HANDLE_VALUE, "CreateFile stderr failed\n"); + if(fileerr == INVALID_HANDLE_VALUE) + return FALSE; + si.dwFlags = STARTF_USESTDHANDLES; si.hStdOutput = file; + si.hStdError = fileerr; bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); ok(bres, "CreateProcess failed: %u\n", GetLastError()); if(!bres) { @@ -66,6 +73,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); CloseHandle(file); + CloseHandle(fileerr); DeleteFileA("test.cmd"); return TRUE; } @@ -185,8 +193,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da exp_ptr++; } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, expected 0x%x\n", line, *exp_ptr); - ok(out_ptr >= out_data+out_size, "too long output\n"); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); } static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size) @@ -203,6 +211,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, UnmapViewOfFile(out_data); } DeleteFileA("test.out"); + DeleteFileA("test.err"); } static void run_from_file(char *file_name)

1 0

Hwang YunSong : ipconfig: Update Korean resource.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 38e1b22d4ba83ab59145bbc2dfdc346ae3c2a0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e1b22d4ba83ab59145bbc2d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Sep 8 17:17:07 2010 +0900 ipconfig: Update Korean resource. --- programs/ipconfig/Ko.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Ko.rc b/programs/ipconfig/Ko.rc index 9f9f7aa..dae65d4 100644 --- a/programs/ipconfig/Ko.rc +++ b/programs/ipconfig/Ko.rc @@ -45,4 +45,6 @@ STRINGTABLE STRING_DESCRIPTION, "설명" STRING_PHYS_ADDR, "물리 주소" STRING_DHCP_ENABLED, "DHCP 가능" + STRING_YES, "예" + STRING_NO, "아니오" }

1 0

Henri Verbeet : ddraw: Just pass FOURCC formats through to wined3d.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 50d3f8081e79738b05a40d949fddc3431c7dab24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d3f8081e79738b05a40d949… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:50 2010 +0200 ddraw: Just pass FOURCC formats through to wined3d. --- dlls/ddraw/utils.c | 42 +----------------------------------------- 1 files changed, 1 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index f9cc0d9..07c3ccc 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -568,47 +568,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } else if(DDPixelFormat->dwFlags & DDPF_FOURCC) { - if(DDPixelFormat->dwFourCC == MAKEFOURCC('U', 'Y', 'V', 'Y')) - { - return WINED3DFMT_UYVY; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'U', 'Y', '2')) - { - return WINED3DFMT_YUY2; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('Y', 'V', '1', '2')) - { - return WINED3DFMT_YV12; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '1')) - { - return WINED3DFMT_DXT1; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '2')) - { - return WINED3DFMT_DXT2; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '3')) - { - return WINED3DFMT_DXT3; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '4')) - { - return WINED3DFMT_DXT4; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('D', 'X', 'T', '5')) - { - return WINED3DFMT_DXT5; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('G', 'R', 'G', 'B')) - { - return WINED3DFMT_G8R8_G8B8; - } - if(DDPixelFormat->dwFourCC == MAKEFOURCC('R', 'G', 'B', 'G')) - { - return WINED3DFMT_R8G8_B8G8; - } - return WINED3DFMT_UNKNOWN; /* Abuse this as an error value */ + return DDPixelFormat->dwFourCC; } else if(DDPixelFormat->dwFlags & DDPF_BUMPDUDV) {

1 0

Henri Verbeet : ddraw: Remove some stray tabs.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: b1a385db110e62a3852c7a2595ff44a09f1c4ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a385db110e62a3852c7a259… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 8 11:24:49 2010 +0200 ddraw: Remove some stray tabs. --- dlls/ddraw/clipper.c | 10 ++-- dlls/ddraw/device.c | 6 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/main.c | 14 +++--- dlls/ddraw/material.c | 30 +++++------ dlls/ddraw/palette.c | 3 +- dlls/ddraw/tests/dsurface.c | 79 +++++++++++++++++------------- dlls/ddraw/utils.c | 4 +- dlls/ddraw/viewport.c | 114 ++++++++++++++++++++++--------------------- 9 files changed, 136 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1a385db110e62a3852c7…

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010