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

Hans Leidekker : sxs: Add a stub implementation of IAssemblyName.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 21e5c4c4172f03c0e982d5c62bd2ddfef63f5fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e5c4c4172f03c0e982d5c62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 14 09:44:12 2012 +0100 sxs: Add a stub implementation of IAssemblyName. --- dlls/sxs/Makefile.in | 1 + dlls/sxs/name.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sxs/sxs.spec | 2 +- include/winsxs.idl | 1 + 4 files changed, 223 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 180f91c..b9832db 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = oleaut32 ole32 C_SRCS = \ cache.c \ + name.c \ sxs.c @MAKE_DLL_RULES@ diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c new file mode 100644 index 0000000..1adeebd --- /dev/null +++ b/dlls/sxs/name.c @@ -0,0 +1,220 @@ +/* + * IAssemblyName implementation + * + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "winsxs.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + +struct name +{ + IAssemblyName IAssemblyName_iface; + LONG refs; +}; + +static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) +{ + return CONTAINING_RECORD( iface, struct name, IAssemblyName_iface ); +} + +static HRESULT WINAPI name_QueryInterface( + IAssemblyName *iface, + REFIID riid, + void **obj ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + + TRACE("%p, %s, %p\n", name, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IUnknown ) || + IsEqualIID( riid, &IID_IAssemblyName )) + { + IUnknown_AddRef( iface ); + *obj = name; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI name_AddRef( + IAssemblyName *iface ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + return InterlockedIncrement( &name->refs ); +} + +static ULONG WINAPI name_Release( IAssemblyName *iface ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + ULONG refs = InterlockedDecrement( &name->refs ); + + if (!refs) + { + TRACE("destroying %p\n", name); + HeapFree( GetProcessHeap(), 0, name ); + } + return refs; +} + +static HRESULT WINAPI name_SetProperty( + IAssemblyName *iface, + DWORD id, + LPVOID property, + DWORD size ) +{ + FIXME("%p, %d, %p, %d\n", iface, id, property, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetProperty( + IAssemblyName *iface, + DWORD id, + LPVOID buffer, + LPDWORD buflen ) +{ + FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Finalize( + IAssemblyName *iface ) +{ + FIXME("%p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetDisplayName( + IAssemblyName *iface, + LPOLESTR buffer, + LPDWORD buflen, + DWORD flags ) +{ + FIXME("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Reserved( + IAssemblyName *iface, + REFIID riid, + IUnknown *pUnkReserved1, + IUnknown *pUnkReserved2, + LPCOLESTR szReserved, + LONGLONG llReserved, + LPVOID pvReserved, + DWORD cbReserved, + LPVOID *ppReserved ) +{ + FIXME("%p, %s, %p, %p, %s, %x%08x, %p, %d, %p\n", iface, + debugstr_guid(riid), pUnkReserved1, pUnkReserved2, + debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + pvReserved, cbReserved, ppReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetName( + IAssemblyName *iface, + LPDWORD buflen, + WCHAR *buffer ) +{ + FIXME("%p, %p, %p\n", iface, buflen, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetVersion( + IAssemblyName *iface, + LPDWORD hi, + LPDWORD low ) +{ + FIXME("%p, %p, %p\n", iface, hi, low); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_IsEqual( + IAssemblyName *name1, + IAssemblyName *name2, + DWORD flags ) +{ + FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Clone( + IAssemblyName *iface, + IAssemblyName **name ) +{ + FIXME("%p, %p\n", iface, name); + return E_NOTIMPL; +} + +static const IAssemblyNameVtbl name_vtbl = +{ + name_QueryInterface, + name_AddRef, + name_Release, + name_SetProperty, + name_GetProperty, + name_Finalize, + name_GetDisplayName, + name_Reserved, + name_GetName, + name_GetVersion, + name_IsEqual, + name_Clone +}; + +/****************************************************************** + * CreateAssemblyNameObject (SXS.@) + */ +HRESULT WINAPI CreateAssemblyNameObject( + LPASSEMBLYNAME *obj, + LPCWSTR assembly, + DWORD flags, + LPVOID reserved ) +{ + struct name *name; + + TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + + if (!obj) return E_INVALIDARG; + + *obj = NULL; + if (!assembly || !assembly[0] || flags != CANOF_PARSE_DISPLAY_NAME) + return E_INVALIDARG; + + if (!(name = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*name) ))) + return E_OUTOFMEMORY; + + name->IAssemblyName_iface.lpVtbl = &name_vtbl; + name->refs = 1; + + *obj = &name->IAssemblyName_iface; + return S_OK; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index e199bb1..2a27313 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,2 @@ @ stdcall CreateAssemblyCache(ptr long) -@ stub CreateAssemblyNameObject +@ stdcall CreateAssemblyNameObject(ptr wstr long ptr) diff --git a/include/winsxs.idl b/include/winsxs.idl index b425b2f..775c69a 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -195,3 +195,4 @@ typedef [public] enum } CREATE_ASM_NAME_OBJ_FLAGS; cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);") +cpp_quote("HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *,LPCWSTR,DWORD,LPVOID);")

1 0

Christian Costa : amstream: Initialize MultiMediastream before creating the source filter.
by Alexandre Julliard 14 Mar '12

14 Mar '12

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 : amstream: Remove duplicate GraphBuilder member.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: b15c4113c0ad887cf7a85ddd405dda5ba4e130e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15c4113c0ad887cf7a85ddd4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:48 2012 +0100 amstream: Remove duplicate GraphBuilder member. --- dlls/amstream/amstream.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 72ace4a..82dcd24 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -36,7 +36,6 @@ typedef struct { LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; - IGraphBuilder* GraphBuilder; ULONG nbStreams; IMediaStream** pStreams; STREAM_TYPE StreamType; @@ -313,10 +312,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac 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; @@ -357,7 +352,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; } - ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); end: IBaseFilter_Release(BaseFilter); @@ -383,7 +378,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG; - return IGraphBuilder_Render(This->GraphBuilder, This->ipin); + return IGraphBuilder_Render(This->pFilterGraph, This->ipin); } static const IAMMultiMediaStreamVtbl AM_Vtbl =

1 0

Christian Costa : amstream: Add source filter to the filtergraph before loading the file.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 14e228c699e6a06792b97f27af2c9d4eda1057ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e228c699e6a06792b97f27a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:56 2012 +0100 amstream: Add source filter to the filtergraph before loading the file. --- dlls/amstream/amstream.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 82dcd24..a731d5e 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -316,6 +316,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac if(ret != S_OK) return ret; + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); + if (FAILED(ret)) + goto end; + ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); if(ret != S_OK) { @@ -337,23 +341,18 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac } ret = IEnumPins_Next(EnumPins, 1, &ipin, NULL); - if(ret == S_OK) + if (ret == S_OK) { ret = IPin_QueryDirection(ipin, &pin_direction); IEnumPins_Release(EnumPins); - if(ret == S_OK && pin_direction == PINDIR_OUTPUT) + if (ret == S_OK && pin_direction == PINDIR_OUTPUT) This->ipin = ipin; - else - goto end; } else { IEnumPins_Release(EnumPins); - goto end; } - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); - end: IBaseFilter_Release(BaseFilter); IFileSourceFilter_Release(SourceFilter);

1 0

Christian Costa : amstream: Free all used resources when releasing MultiMediaStream object.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: abc6d186ead35d2cad28c5a2a69183c6ed4f3a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc6d186ead35d2cad28c5a2a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:55:04 2012 +0100 amstream: Free all used resources when releasing MultiMediaStream object. --- dlls/amstream/amstream.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index a731d5e..c771f77 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -106,11 +106,20 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p/%p)\n", iface, This); if (!ref) + { + for(i = 0; i < This->nbStreams; i++) + IMediaStream_Release(This->pStreams[i]); + if (This->ipin) + IPin_Release(This->ipin); + if (This->pFilterGraph) + IGraphBuilder_Release(This->pFilterGraph); HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Christian Costa : devenum: Reset moniker pointer before calling IFilterMapper2_RegisterFilter.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: a85957ae0ec324e09c232dabb0e830112a169d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85957ae0ec324e09c232dabb… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:52:30 2012 +0100 devenum: Reset moniker pointer before calling IFilterMapper2_RegisterFilter. --- dlls/devenum/createdevenum.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 5a20da5..615305d 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -670,8 +670,11 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) + { + IMoniker_Release(pMoniker); + pMoniker = NULL; + } wsprintfW(szDSoundName, szDSoundNameFormat, wocaps.szPname); res = IFilterMapper2_RegisterFilter(pMapper,

1 0

Christian Costa : d3dx9_36: Make D3DXVec3Unproject support omission of world matrix + test.
by Alexandre Julliard 14 Mar '12

14 Mar '12

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 : attrib: Make command accept several arguments.
by Alexandre Julliard 14 Mar '12

14 Mar '12

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

Akihiro Sagawa : msvcrt/tests: Add tests for fflush on input stream.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 09a7f8c196f3416becbfc4f1500b733e06040e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a7f8c196f3416becbfc4f15… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:03 2012 +0900 msvcrt/tests: Add tests for fflush on input stream. --- dlls/msvcrt/tests/file.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b9b904d..9e93234 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -591,6 +591,58 @@ static void test_flsbuf( void ) free(tempf); } +static void test_fflush( void ) +{ + static const char obuf[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + char buf1[16], buf2[24]; + char *tempf; + FILE *tempfh; + int ret; + + tempf=_tempnam(".","wne"); + + /* Prepare the file. */ + tempfh = fopen(tempf,"wb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fwrite(obuf, 1, sizeof(obuf), tempfh); + fclose(tempfh); + + /* Open the file for input. */ + tempfh = fopen(tempf,"rb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fread(buf1, 1, sizeof(buf1), tempfh); + + /* Using fflush() on input stream is undefined in ANSI. + * But MSDN says that it clears input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = fflush(tempfh); + ok(ret == 0, "expected 0, got %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]); + + /* fflush(NULL) doesn't clear input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = fflush(NULL); + ok(ret == 0, "expected 0, got %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + ok(memcmp(buf1, buf2, sizeof(buf1)) != 0, "Got unexpected data (%c)\n", buf2[0]); + + /* _flushall() clears input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = _flushall(); + 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]); + + fclose(tempfh); + + unlink(tempf); + free(tempf); +} + static void test_fgetwc( void ) { #define LLEN 512 @@ -1582,6 +1634,7 @@ START_TEST(file) test_fgetc(); test_fputc(); test_flsbuf(); + test_fflush(); test_fgetwc(); test_ctrlz(); test_file_put_get();

1 0

Akihiro Sagawa : msvcrt: Add support for fflush to clear an input buffer.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 1a01893c746beff8b41b7ad9c78df47ced89a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a01893c746beff8b41b7ad9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:04 2012 +0900 msvcrt: Add support for fflush to clear an input buffer. --- dlls/msvcrt/file.c | 7 +++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c15e33f..7fbe07e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -792,6 +792,13 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) MSVCRT__unlock_file(file); return res; + } else if(file->_flag & MSVCRT__IOREAD) { + MSVCRT__lock_file(file); + file->_cnt = 0; + file->_ptr = file->_base; + MSVCRT__unlock_file(file); + + return 0; } return 0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9e93234..6d745d9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -619,7 +619,7 @@ static void test_fflush( void ) ok(ret == 0, "expected 0, got %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]); /* fflush(NULL) doesn't clear input buffer. */ _lseek(_fileno(tempfh), 0, SEEK_SET);

1 0