March 2012 - Wine-Commits - list.winehq.org

Stefan Leichter : mgmtapi: New stub dll.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: f91c9cc44a93fcc0779ea5c3a256c0fdec052387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c9cc44a93fcc0779ea5c3a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Mar 9 00:31:49 2012 +0100 mgmtapi: New stub dll. --- configure | 1 + configure.ac | 1 + dlls/mgmtapi/Makefile.in | 5 +++++ dlls/mgmtapi/mgmtapi.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/mgmtapi/mgmtapi.spec | 9 +++++++++ 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fc75580..3a62558 100755 --- a/configure +++ b/configure @@ -15115,6 +15115,7 @@ wine_fn_config_dll mcicda enable_mcicda wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave +wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang implib wine_fn_config_test dlls/mlang/tests mlang_test diff --git a/configure.ac b/configure.ac index 63c2fb4..472ef12 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,6 +2624,7 @@ WINE_CONFIG_DLL(mcicda) WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) +WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[implib]) WINE_CONFIG_TEST(dlls/mlang/tests) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in new file mode 100644 index 0000000..fde16ae --- /dev/null +++ b/dlls/mgmtapi/Makefile.in @@ -0,0 +1,5 @@ +MODULE = mgmtapi.dll + +C_SRCS = mgmtapi.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c new file mode 100644 index 0000000..0cde5d5 --- /dev/null +++ b/dlls/mgmtapi/mgmtapi.c @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Stefan Leichter + * + * 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 "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/mgmtapi/mgmtapi.spec b/dlls/mgmtapi/mgmtapi.spec new file mode 100644 index 0000000..9166cd4 --- /dev/null +++ b/dlls/mgmtapi/mgmtapi.spec @@ -0,0 +1,9 @@ +@ stub SnmpMgrClose +@ stub SnmpMgrCtl +@ stub SnmpMgrGetTrap +@ stub SnmpMgrGetTrapEx +@ stub SnmpMgrOidToStr +@ stub SnmpMgrOpen +@ stub SnmpMgrrequest +@ stub SnmpMgrStrToOid +@ stub SnmpMgrTrapListen

1 0

Akihiro Sagawa : msvcrt: Add support for _flushall to clear all input buffer.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: cf7479ca85924eb754857ea2ff8509606f10c1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7479ca85924eb754857ea2f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:07 2012 +0900 msvcrt: Add support for _flushall to clear all input buffer. --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b057f9e..1c56eee 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -780,7 +780,7 @@ static int msvcrt_flush_all_buffers(int mask) */ int CDECL MSVCRT__flushall(void) { - return msvcrt_flush_all_buffers(MSVCRT__IOWRT); + return msvcrt_flush_all_buffers(MSVCRT__IOWRT | MSVCRT__IOREAD); } /********************************************************************* @@ -789,7 +789,7 @@ int CDECL MSVCRT__flushall(void) int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { if(!file) { - MSVCRT__flushall(); + msvcrt_flush_all_buffers(MSVCRT__IOWRT); } else if(file->_flag & MSVCRT__IOWRT) { int res; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 6d745d9..0f94083 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -635,7 +635,7 @@ static void test_fflush( void ) ok(ret >= 0, "unexpected ret %d\n", ret); memset(buf2, '?', sizeof(buf2)); fread(buf2, 1, sizeof(buf2), tempfh); - todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); fclose(tempfh);

1 0

Christian Costa : d3dx9_36: Make D3DXVec3Unproject support omission of world matrix + test.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: a7692beb613f6eff6e93aca365f10edc7e826701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7692beb613f6eff6e93aca36… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:53:24 2012 +0100 d3dx9_36: Make D3DXVec3Unproject support omission of world matrix + test. --- dlls/d3dx9_36/math.c | 8 ++++++-- dlls/d3dx9_36/tests/math.c | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 9289abc..b9271e0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1661,8 +1661,12 @@ D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, D3DXMATRIX m; D3DXVECTOR3 out; - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); + if (pworld) { + D3DXMatrixMultiply(&m, pworld, pview); + D3DXMatrixMultiply(&m, &m, pprojection); + } else { + D3DXMatrixMultiply(&m, pview, pprojection); + } D3DXMatrixInverse(&m, NULL, &m); out.x = 2.0f * ( pv->x - pviewport->X ) / pviewport->Width - 1.0f; out.y = 1.0f - 2.0f * ( pv->y - pviewport->Y ) / pviewport->Height; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 83e2ef6..61f8567 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1197,9 +1197,9 @@ static void D3DXVector3Test(void) expect_vec3(expectedvec,gotvec); /*_______________D3DXVec3Length__________________________*/ - expected = 11.0f; - got = D3DXVec3Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + expected = 11.0f; + got = D3DXVec3Length(&u); + ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /* Tests the case NULL */ expected=0.0f; got = D3DXVec3Length(NULL); @@ -1299,6 +1299,10 @@ static void D3DXVector3Test(void) D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&view,&world); expect_vec3(expectedvec,gotvec); + /* World matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&mat,NULL); + expect_vec3(expectedvec,gotvec); } static void D3DXVector4Test(void)

1 0

Christian Costa : amstream: Initialize MultiMediastream before creating the source filter.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 8b5f6bf3f40aa3df05f5d5749b8945c8f2844803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b5f6bf3f40aa3df05f5d5749… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:39 2012 +0100 amstream: Initialize MultiMediastream before creating the source filter. --- dlls/amstream/amstream.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index bebe6e8..72ace4a 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -305,6 +305,18 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); + /* If Initialize was not called before, we do it here */ + if (!This->pFilterGraph) + { + ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); + if (FAILED(ret)) + return ret; + } + + ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); + if (ret != S_OK) + goto end; + ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); if(ret != S_OK) return ret; @@ -345,20 +357,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; } - /* If Initialize was not called before, we do it here */ - if (!This->pFilterGraph) - { - ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); - if (FAILED(ret)) - goto end; - } - - ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); - if(ret != S_OK) - { - goto end; - } - ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); end:

1 0

Christian Costa : attrib: Make command accept several arguments.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: d59538f977819149b152f508a366892003c5d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59538f977819149b152f508a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:51:56 2012 +0100 attrib: Make command accept several arguments. --- programs/attrib/attrib.c | 73 +++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 33 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index eb497ee..9846c5e 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -1,7 +1,7 @@ /* * ATTRIB - Wine-compatible attrib program * - * Copyright 2010-2011 Christian Costa + * Copyright 2010-2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,7 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); * Load a string from the resource file, handling any error * Returns string retrieved from resource file * ========================================================================= */ -static WCHAR *ATTRIB_LoadMessage(UINT id) { +static WCHAR *ATTRIB_LoadMessage(UINT id) +{ static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; @@ -45,8 +46,8 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) { - +static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) +{ static WCHAR *output_bufW = NULL; static char *output_bufA = NULL; static BOOL toConsole = TRUE; @@ -128,43 +129,49 @@ int wmain(int argc, WCHAR *argv[]) WIN32_FIND_DATAW fd; WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; WCHAR name[128]; - WCHAR *param = argc >= 2 ? argv[1] : NULL; DWORD attrib_set = 0; DWORD attrib_clear = 0; - WCHAR help_option[] = {'/','?','\0'}; + const WCHAR help_option[] = {'/','?','\0'}; + const WCHAR slashStarW[] = {'\\','*','\0'}; + int i = 1; - if (param && !strcmpW(param, help_option)) - { + if ((argc >= 2) && !strcmpW(argv[1], help_option)) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } - if (param && (param[0] == '+' || param[0] == '-')) { - DWORD attrib = 0; - /* FIXME: the real cmd can handle many more than two args; this should be in a loop */ - switch (param[1]) { - case 'H': case 'h': attrib |= FILE_ATTRIBUTE_HIDDEN; break; - case 'S': case 's': attrib |= FILE_ATTRIBUTE_SYSTEM; break; - case 'R': case 'r': attrib |= FILE_ATTRIBUTE_READONLY; break; - case 'A': case 'a': attrib |= FILE_ATTRIBUTE_ARCHIVE; break; - default: - ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_NYI)); - return 0; - } - switch (param[0]) { - case '+': attrib_set = attrib; break; - case '-': attrib_clear = attrib; break; + /* By default all files from current directory are taken into account */ + GetCurrentDirectoryW(sizeof(name)/sizeof(WCHAR), name); + strcatW (name, slashStarW); + + while (i < argc) { + WCHAR *param = argv[i++]; + if ((param[0] == '+') || (param[0] == '-')) { + DWORD attrib = 0; + switch (param[1]) { + case 'H': case 'h': attrib |= FILE_ATTRIBUTE_HIDDEN; break; + case 'S': case 's': attrib |= FILE_ATTRIBUTE_SYSTEM; break; + case 'R': case 'r': attrib |= FILE_ATTRIBUTE_READONLY; break; + case 'A': case 'a': attrib |= FILE_ATTRIBUTE_ARCHIVE; break; + default: + ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_NYI)); + return 0; + } + switch (param[0]) { + case '+': attrib_set = attrib; break; + case '-': attrib_clear = attrib; break; + } + } else if (param[0] == '/') { + if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { + WINE_FIXME("Option /D not yet supported\n"); + } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { + WINE_FIXME("Option /R not yet supported\n"); + } else { + WINE_FIXME("Unrecognize option\n"); + } + } else if (param[0]) { + strcpyW(name, param); } - param = argc >= 3 ? argv[2] : NULL; - } - - if (!param || strlenW(param) == 0) { - static const WCHAR slashStarW[] = {'\\','*','\0'}; - - GetCurrentDirectoryW(sizeof(name)/sizeof(WCHAR), name); - strcatW (name, slashStarW); - } else { - strcpyW(name, param); } hff = FindFirstFileW(name, &fd);

1 0

Austin English : wusa: Add stub program.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: bec293f3ffe4c62dd83af9ff622ce961e8e2e79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec293f3ffe4c62dd83af9ff6… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 14:34:36 2012 -0800 wusa: Add stub program. --- configure | 1 + configure.ac | 1 + programs/wusa/Makefile.in | 7 +++++++ programs/wusa/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 045d4f5..fc75580 100755 --- a/configure +++ b/configure @@ -15510,6 +15510,7 @@ wine_fn_config_program wordpad enable_wordpad install,po wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript install wine_fn_config_test programs/wscript/tests wscript.exe_test +wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_makefile server enable_server install-lib,manpage wine_fn_config_tool tools install-dev,install-lib,manpage diff --git a/configure.ac b/configure.ac index 27db29c..63c2fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3019,6 +3019,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[install,po]) WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[install]) WINE_CONFIG_TEST(programs/wscript/tests) +WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_MAKEFILE([server],,[install-lib,manpage]) WINE_CONFIG_TOOL(tools,[install-dev,install-lib,manpage]) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in new file mode 100644 index 0000000..01978d5 --- /dev/null +++ b/programs/wusa/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wusa.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/wusa/main.c b/programs/wusa/main.c new file mode 100644 index 0000000..aa7a38f --- /dev/null +++ b/programs/wusa/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Austin English + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wusa); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Nikolay Sivov : msxml3: Implement getIndexFromQName() for MXAttributes.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: c685b92b3d36835c436c4c86dae707c4cca8fe0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c685b92b3d36835c436c4c86d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 12:18:55 2012 +0300 msxml3: Implement getIndexFromQName() for MXAttributes. --- dlls/msxml3/mxwriter.c | 25 +++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 86c0da0..3bb4c7a 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1786,12 +1786,29 @@ static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR * pQName, - int nQNameLength, int * index) +static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR *qname, + int len, int *index) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %p): stub\n", This, debugstr_wn(pQName, nQNameLength), nQNameLength, index); - return E_NOTIMPL; + int i; + + TRACE("(%p)->(%s:%d %p)\n", This, debugstr_wn(qname, len), len, index); + + if (!index && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + if (!qname || !index || !len) return E_INVALIDARG; + + for (i = 0; i < This->length; i++) + { + if (len != SysStringLen(This->attr[i].qname)) continue; + if (strncmpW(qname, This->attr[i].qname, len)) continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI SAXAttributes_getType(ISAXAttributes *iface, int index, const WCHAR **type, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ccd690a..e9cfda8 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3299,8 +3299,8 @@ static void test_mxattr_addAttribute(void) ISAXAttributes *saxattr; IMXAttributes *mxattr; const WCHAR *value; + int len, index; HRESULT hr; - int len; if (!is_clsid_supported(table->clsid, mxattributes_support_data)) { @@ -3405,6 +3405,38 @@ static void test_mxattr_addAttribute(void) ok(*value == 0, "%d: got type value %s\n", i, wine_dbgstr_w(value)); ok(len == 0, "%d: got wrong type value length %d\n", i, len); } + + hr = ISAXAttributes_getIndexFromQName(saxattr, NULL, 0, NULL); + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + EXPECT_HR(hr, E_POINTER); + } + else + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromQName(saxattr, NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_("nonexistent"), 11, &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%d: got wrong index %d\n", i, index); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%d: got wrong index %d\n", i, index); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), &index); + EXPECT_HR(hr, S_OK); + ok(index == 0, "%d: got wrong index %d\n", i, index); + + index = -1; + hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), strlen(table->qname)-1, &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%d: got wrong index %d\n", i, index); } len = -1;

1 0

Nikolay Sivov : msxml3: Implement getValue() for MXAttributes.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 4cddf045fc6e7b7c4aaaf39db2d3b91a7e7004ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cddf045fc6e7b7c4aaaf39db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 09:21:05 2012 +0300 msxml3: Implement getValue() for MXAttributes. --- dlls/msxml3/mxwriter.c | 18 ++++++++++++++---- dlls/msxml3/tests/saxreader.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index f749eb5..b28bd19 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1819,12 +1819,22 @@ static HRESULT WINAPI SAXAttributes_getTypeFromQName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int nIndex, const WCHAR ** pValue, - int * nValue) +static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int index, const WCHAR **value, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pValue, nValue); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, value, len); + + if (index >= This->length) return E_INVALIDARG; + + if ((!value || !len) && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + *value = This->attr[index].value; + *len = SysStringLen(This->attr[index].value); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR * pUri, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 8b0a3c4..95c7787 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3298,6 +3298,7 @@ static void test_mxattr_addAttribute(void) { ISAXAttributes *saxattr; IMXAttributes *mxattr; + const WCHAR *value; HRESULT hr; int len; @@ -3328,10 +3329,46 @@ static void test_mxattr_addAttribute(void) EXPECT_HR(hr, S_OK); ok(len == 0, "got %d\n", len); + hr = ISAXAttributes_getValue(saxattr, 0, &value, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + if (hr == S_OK) + { + /* SAXAttributes40 and SAXAttributes60 both crash on this test */ + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + } + + len = -1; + hr = ISAXAttributes_getValue(saxattr, 0, &value, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + } + len = -1; hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK);

1 0

Alexandre Julliard : comdlg32: Implement WM_CHOOSEFONT_GETLOGFONT in the font dialog.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 66ea6464c20ba24f7844b4eaba4e2e0621a87142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ea6464c20ba24f7844b4eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 22:12:07 2012 +0100 comdlg32: Implement WM_CHOOSEFONT_GETLOGFONT in the font dialog. --- dlls/comdlg32/fontdlg.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index c081e91..25dc1e4 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1194,9 +1194,14 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, case WM_DESTROY: return CFn_WMDestroy(hDlg, lpcfw); case WM_CHOOSEFONT_GETLOGFONT: + { + LOGFONTA *logfont = (LOGFONTA *)lParam; TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); - FIXME("current logfont back to caller\n"); + memcpy( logfont, lpcfw->lpLogFont, FIELD_OFFSET( LOGFONTA, lfFaceName )); + WideCharToMultiByte( CP_ACP, 0, lpcfw->lpLogFont->lfFaceName, LF_FACESIZE, + logfont->lfFaceName, LF_FACESIZE, NULL, NULL ); break; + } case WM_PAINT: return CFn_WMPaint(hDlg, wParam, lParam, lpcfw); } @@ -1242,7 +1247,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, return TRUE; case WM_CHOOSEFONT_GETLOGFONT: TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); - FIXME("current logfont back to caller\n"); + memcpy( (LOGFONTW *)lParam, lpcf->lpLogFont, sizeof(LOGFONTW) ); break; case WM_PAINT: return CFn_WMPaint(hDlg, wParam, lParam, lpcf);

1 0

Henri Verbeet : ddraw: Don' t return a pointer to the implementation in IDirect3DDeviceImpl_7_QueryInterface ().
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 9157006fc17fb8f17adc8536391ef562d2f690f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9157006fc17fb8f17adc85363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 20:31:34 2012 +0100 ddraw: Don't return a pointer to the implementation in IDirect3DDeviceImpl_7_QueryInterface(). --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e7f3faf..fb65272 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -175,7 +175,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, TRACE("(%p) Returning IDirect3DDevice3 interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice7 , refiid ) ) { - *obj = This; + *obj = &This->IDirect3DDevice7_iface; TRACE("(%p) Returning IDirect3DDevice7 interface at %p\n", This, *obj); }

1 0