January 2010 - Wine-Commits

Christian Costa : d3drm: Add definitions for IDirect3DRMMeshBuilder3.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 47c40897b1c0a283f1282cc383752eb85b5ebb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c40897b1c0a283f1282cc38… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 26 08:17:09 2010 +0100 d3drm: Add definitions for IDirect3DRMMeshBuilder3. --- include/d3drmobj.h | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 232 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47c40897b1c0a283f1282…

1 0

Christian Costa : shell32: Improve some FIXMEs.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 5a647e87c1cf98679f2bc47caf8ccea44dd60fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a647e87c1cf98679f2bc47ca… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Jan 26 08:16:37 2010 +0100 shell32: Improve some FIXMEs. --- dlls/shell32/shelllink.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index e304058..1718df7 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -499,7 +499,7 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *ppszFileName) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - FIXME("(%p)\n",This); + FIXME("(%p)->(%p): stub\n", This, ppszFileName); return NOERROR; } @@ -2313,7 +2313,7 @@ ShellLink_DataList_Release( IShellLinkDataList* iface ) static HRESULT WINAPI ShellLink_AddDataBlock( IShellLinkDataList* iface, void* pDataBlock ) { - FIXME("\n"); + FIXME("(%p)->(%p): stub\n", iface, pDataBlock); return E_NOTIMPL; } @@ -2351,7 +2351,7 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl static HRESULT WINAPI ShellLink_RemoveDataBlock( IShellLinkDataList* iface, DWORD dwSig ) { - FIXME("\n"); + FIXME("(%p)->(%u): stub\n", iface, dwSig); return E_NOTIMPL; } @@ -2361,7 +2361,7 @@ ShellLink_GetFlags( IShellLinkDataList* iface, DWORD* pdwFlags ) IShellLinkImpl *This = impl_from_IShellLinkDataList(iface); DWORD flags = 0; - FIXME("%p %p\n", This, pdwFlags ); + FIXME("(%p)->(%p): partially implemented\n", This, pdwFlags); /* FIXME: add more */ if (This->sArgs) @@ -2383,7 +2383,7 @@ ShellLink_GetFlags( IShellLinkDataList* iface, DWORD* pdwFlags ) static HRESULT WINAPI ShellLink_SetFlags( IShellLinkDataList* iface, DWORD dwFlags ) { - FIXME("\n"); + FIXME("(%p)->(%u): stub\n", iface, dwFlags); return E_NOTIMPL; } @@ -2639,7 +2639,7 @@ ShellLink_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, { IShellLinkImpl *This = impl_from_IContextMenu(iface); - FIXME("%p %lu %u %p %p %u\n", This, + FIXME("(%p)->(%lu %u %p %p %u): stub\n", This, idCmd, uType, pwReserved, pszName, cchMax ); return E_NOTIMPL;

1 0

Stefan Dösinger : wined3d: Put the APPLE_flush_buffer_range code into the right branch.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: ee720f05d1b925aae5f6530b3b1d3e32c520bc43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee720f05d1b925aae5f6530b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 25 23:39:43 2010 +0100 wined3d: Put the APPLE_flush_buffer_range code into the right branch. --- dlls/wined3d/buffer.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 024aab5..e38a861 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -145,11 +145,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) { TRACE("Gl usage = GL_STREAM_DRAW_ARB\n"); gl_usage = GL_STREAM_DRAW_ARB; - } - else - { - TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { @@ -158,6 +153,11 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) This->flags |= WINED3D_BUFFER_FLUSH; } } + else + { + TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); + gl_usage = GL_DYNAMIC_DRAW_ARB; + } /* Reserve memory for the buffer. The amount of data won't change * so we are safe with calling glBufferData once and

1 0

Paul Vriens : shell32/tests: Fix the old shell32 detection.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 31d08405d94894a3b8812868e54ad1a0c22fb5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d08405d94894a3b8812868e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 26 11:08:50 2010 +0100 shell32/tests: Fix the old shell32 detection. --- dlls/shell32/tests/shlfileop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 681d464..3e9f9c7 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2302,7 +2302,7 @@ static BOOL is_old_shell32(void) shfo.hNameMappings = NULL; shfo.lpszProgressTitle = NULL; - set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt"); + set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0"); retval = SHFileOperationA(&shfo);

1 0

Michael Stefaniuc : comctl32: Use IS_INTRESOURCE instead of HIWORD to check a resource.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 223603cc1c97c89663da12bf200b193199d7da44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223603cc1c97c89663da12bf2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 26 00:50:44 2010 +0100 comctl32: Use IS_INTRESOURCE instead of HIWORD to check a resource. --- dlls/comctl32/animate.c | 4 ++-- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/propsheet.c | 42 +++++++++++++++++++++--------------------- dlls/comctl32/toolbar.c | 12 ++++++------ 4 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=223603cc1c97c89663da1…

1 0

Nikolay Sivov : gdi32: Add GdiInitializeLanguagePack() stub.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: b3a193a5dd98aeb99c845f1e5c4a1e01abe6e9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a193a5dd98aeb99c845f1e5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 26 00:01:04 2010 +0300 gdi32: Add GdiInitializeLanguagePack() stub. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdiobj.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 96faf06..e33a7ae 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -193,7 +193,7 @@ @ stdcall GdiGetSpoolMessage(ptr long ptr long) @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() -# @ stub GdiInitializeLanguagePack +@ stdcall GdiInitializeLanguagePack(long) @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 7d03792..bf4813f 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1164,6 +1164,14 @@ void WINAPI SetObjectOwner( HGDIOBJ handle, HANDLE owner ) /* Nothing to do */ } +/*********************************************************************** + * GdiInitializeLanguagePack (GDI32.@) + */ +DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) +{ + FIXME("stub\n"); + return 0; +} /*********************************************************************** * GdiFlush (GDI32.@) @@ -1199,7 +1207,7 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit ) */ BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) { - FIXME("GetColorAdjustment, stub\n"); + FIXME("stub\n"); return 0; } @@ -1228,6 +1236,6 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) */ BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) { - FIXME("SetColorAdjustment, stub\n"); + FIXME("stub\n"); return 0; }

1 0

Nikolay Sivov : xmllite: Don't release reader input reference on failure, as newer versions do.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 5864234051b12ea3f84541096b5c9fcefd732ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5864234051b12ea3f84541096… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 25 22:37:59 2010 +0300 xmllite: Don't release reader input reference on failure, as newer versions do. --- dlls/xmllite/reader.c | 15 +++------------ dlls/xmllite/tests/reader.c | 4 +++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 89dcf1d..e08e8fb 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -103,11 +103,8 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { - if (This->input) - { - IUnknown_Release(This->stream); - IUnknown_Release(This->input); - } + if (This->input) IUnknown_Release(This->input); + if (This->stream) IUnknown_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -154,13 +151,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) /* set stream for supplied IXmlReaderInput */ hr = xmlreaderinput_query_for_stream(This->input, (void**)&This->stream); - if (hr != S_OK) - { - /* IXmlReaderInput doesn't provide streaming interface */ - IUnknown_Release(This->input); - This->input = NULL; - } - else + if (hr == S_OK) This->state = XmlReadState_Initial; return hr; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c594d48..4636d35 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -440,6 +440,7 @@ static void test_readerinput(void) IUnknown_Release(reader_input); IUnknown_Release(reader_input); + IUnknown_Release(reader_input); IStream_Release(stream); /* test input interface selection sequence */ @@ -479,7 +480,8 @@ static void test_readerinput(void) IUnknown_Release(input); ref = IUnknown_AddRef(reader_input); - ok(ref == 2, "Expected 2, got %d\n", ref); + ok(ref == 3 || broken(ref == 2) /* versions 1.0.x and 1.1.x - XP, Vista */, + "Expected 3, got %d\n", ref); IUnknown_Release(reader_input); /* repeat another time, no check or caching here */ input_iids.count = 0;

1 0

Michael Stefaniuc : kernel32: Use IS_INTRESOURCE instead of HIWORD to check a resource.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 02bddd1caf42df35f76baee6b255ad6fddfc93bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bddd1caf42df35f76baee6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 26 00:50:34 2010 +0100 kernel32: Use IS_INTRESOURCE instead of HIWORD to check a resource. --- dlls/kernel32/resource.c | 53 ++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index d364739..0050cb9 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -39,10 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(resource); +/* we don't want to include winuser.h just for this */ +#define IS_INTRESOURCE(x) (((ULONG_PTR)(x) >> 16) == 0) + /* retrieve the resource name to pass to the ntdll functions */ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) { - if (!HIWORD(name)) + if (IS_INTRESOURCE(name)) { str->Buffer = ULongToPtr(LOWORD(name)); return STATUS_SUCCESS; @@ -63,7 +66,7 @@ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) /* retrieve the resource name to pass to the ntdll functions */ static NTSTATUS get_res_nameW( LPCWSTR name, UNICODE_STRING *str ) { - if (!HIWORD(name)) + if (IS_INTRESOURCE(name)) { str->Buffer = ULongToPtr(LOWORD(name)); return STATUS_SUCCESS; @@ -110,8 +113,8 @@ static HRSRC find_resourceA( HMODULE hModule, LPCSTR type, LPCSTR name, WORD lan } __ENDTRY - if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); - if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); return (HRSRC)entry; } @@ -143,8 +146,8 @@ static HRSRC find_resourceW( HMODULE hModule, LPCWSTR type, LPCWSTR name, WORD l } __ENDTRY - if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); - if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); return (HRSRC)entry; } @@ -357,7 +360,7 @@ BOOL WINAPI EnumResourceNamesA( HMODULE hmod, LPCSTR type, ENUMRESNAMEPROCA lpfu done: HeapFree( GetProcessHeap(), 0, name ); - if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -427,7 +430,7 @@ BOOL WINAPI EnumResourceNamesW( HMODULE hmod, LPCWSTR type, ENUMRESNAMEPROCW lpf __ENDTRY done: HeapFree( GetProcessHeap(), 0, name ); - if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -478,8 +481,8 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, } __ENDTRY done: - if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); - if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -530,8 +533,8 @@ BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, } __ENDTRY done: - if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); - if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); + if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); return ret; } @@ -619,12 +622,12 @@ static int resource_strcmp( LPCWSTR a, LPCWSTR b ) { if ( a == b ) return 0; - if (HIWORD( a ) && HIWORD( b ) ) + if (!IS_INTRESOURCE( a ) && !IS_INTRESOURCE( b ) ) return lstrcmpW( a, b ); /* strings come before ids */ - if (HIWORD( a ) && !HIWORD( b )) + if (!IS_INTRESOURCE( a ) && IS_INTRESOURCE( b )) return -1; - if (HIWORD( b ) && !HIWORD( a )) + if (!IS_INTRESOURCE( b ) && IS_INTRESOURCE( a )) return 1; return ( a < b ) ? -1 : 1; } @@ -688,7 +691,7 @@ static LPWSTR res_strdupW( LPCWSTR str ) LPWSTR ret; UINT len; - if (HIWORD(str) == 0) + if (IS_INTRESOURCE(str)) return (LPWSTR) (UINT_PTR) LOWORD(str); len = (lstrlenW( str ) + 1) * sizeof (WCHAR); ret = HeapAlloc( GetProcessHeap(), 0, len ); @@ -698,7 +701,7 @@ static LPWSTR res_strdupW( LPCWSTR str ) static void res_free_str( LPWSTR str ) { - if (HIWORD(str)) + if (!IS_INTRESOURCE(str)) HeapFree( GetProcessHeap(), 0, str ); } @@ -1157,14 +1160,14 @@ static void get_resource_sizes( QUEUEDUPDATES *updates, struct resource_size_inf LIST_FOR_EACH_ENTRY( types, &updates->root, struct resource_dir_entry, entry ) { num_types++; - if (HIWORD( types->id )) + if (!IS_INTRESOURCE( types->id )) strings_size += sizeof (WORD) + lstrlenW( types->id )*sizeof (WCHAR); LIST_FOR_EACH_ENTRY( names, &types->children, struct resource_dir_entry, entry ) { num_names++; - if (HIWORD( names->id )) + if (!IS_INTRESOURCE( names->id )) strings_size += sizeof (WORD) + lstrlenW( names->id )*sizeof (WCHAR); LIST_FOR_EACH_ENTRY( data, &names->children, struct resource_data, entry ) @@ -1233,7 +1236,7 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc e1 = (IMAGE_RESOURCE_DIRECTORY_ENTRY*) &base[si->types_ofs]; memset( e1, 0, sizeof *e1 ); - if (HIWORD( types->id )) + if (!IS_INTRESOURCE( types->id )) { WCHAR *strings; DWORD len; @@ -1269,7 +1272,7 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc e2 = (IMAGE_RESOURCE_DIRECTORY_ENTRY*) &base[si->names_ofs]; memset( e2, 0, sizeof *e2 ); - if (HIWORD( names->id )) + if (!IS_INTRESOURCE( names->id )) { WCHAR *strings; DWORD len; @@ -1655,16 +1658,16 @@ BOOL WINAPI UpdateResourceA( HANDLE hUpdate, LPCSTR lpType, LPCSTR lpName, BOOL ret; UNICODE_STRING TypeW; UNICODE_STRING NameW; - if(!HIWORD(lpType)) + if(IS_INTRESOURCE(lpType)) TypeW.Buffer = ULongToPtr(LOWORD(lpType)); else RtlCreateUnicodeStringFromAsciiz(&TypeW, lpType); - if(!HIWORD(lpName)) + if(IS_INTRESOURCE(lpName)) NameW.Buffer = ULongToPtr(LOWORD(lpName)); else RtlCreateUnicodeStringFromAsciiz(&NameW, lpName); ret = UpdateResourceW(hUpdate, TypeW.Buffer, NameW.Buffer, wLanguage, lpData, cbData); - if(HIWORD(lpType)) RtlFreeUnicodeString(&TypeW); - if(HIWORD(lpName)) RtlFreeUnicodeString(&NameW); + if(!IS_INTRESOURCE(lpType)) RtlFreeUnicodeString(&TypeW); + if(!IS_INTRESOURCE(lpName)) RtlFreeUnicodeString(&NameW); return ret; }

1 0

Nikolay Sivov : xmllite: Reset state to XmlReadState_Initial on input reset , update tests to run on new versions.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: b109c5c680e1fe740dc5b445a4611c86db6f8bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b109c5c680e1fe740dc5b445a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 25 23:52:09 2010 +0300 xmllite: Reset state to XmlReadState_Initial on input reset, update tests to run on new versions. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 50 ++++++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e08e8fb..00a48fc 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -135,7 +135,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) /* just reset current input */ if (!input) { - This->state = XmlReadState_Closed; + This->state = XmlReadState_Initial; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 4636d35..0f51a2f 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -74,27 +74,35 @@ static IStream *create_stream_on_data(const char *data, int size) return stream; } -static void ok_pos_(IXmlReader *reader, int line, int pos, int todo, int _line_) +static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, + int pos_broken, int todo, int _line_) { UINT l, p; HRESULT hr; + int broken_state; hr = IXmlReader_GetLineNumber(reader, &l); ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = IXmlReader_GetLinePosition(reader, &p); ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + if (line_broken == -1 && pos_broken == -1) + broken_state = 0; + else + broken_state = broken((line_broken == -1 ? line : line_broken) == l && + (pos_broken == -1 ? pos : pos_broken) == p); + if (todo) todo_wine - ok_(__FILE__, _line_)(l == line && pos == p, + ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); else { - ok_(__FILE__, _line_)(l == line && pos == p, + ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); } } -#define ok_pos(reader, l, p, todo) ok_pos_(reader, l, p, todo, __LINE__) +#define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) typedef struct input_iids_t { IID iids[10]; @@ -214,27 +222,34 @@ static const char *type_to_str(XmlNodeType type) } } -static void test_read_state_(IXmlReader *reader, XmlReadState expected, int todo, int line) +static void test_read_state_(IXmlReader *reader, XmlReadState expected, + XmlReadState exp_broken, int todo, int line) { XmlReadState state; HRESULT hr; + int broken_state; state = -1; /* invalid value */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + if (exp_broken == -1) + broken_state = 0; + else + broken_state = broken(exp_broken == state); + if (todo) { todo_wine - ok_(__FILE__, line)(state == expected, "Expected (%s), got (%s)\n", + ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", state_to_str(expected), state_to_str(state)); } else - ok_(__FILE__, line)(state == expected, "Expected (%s), got (%s)\n", + ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", state_to_str(expected), state_to_str(state)); } -#define test_read_sate(reader, exp, todo) test_read_state_(reader, exp, todo, __LINE__) +#define test_read_sate(reader, exp, brk, todo) test_read_state_(reader, exp, brk, todo, __LINE__) typedef struct _testinput { @@ -340,13 +355,13 @@ static void test_reader_create(void) hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Closed, FALSE); + test_read_sate(reader, XmlReadState_Closed, -1, FALSE); /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Closed, FALSE); + test_read_sate(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); /* test input interface selection sequence */ hr = testinput_createinstance((void**)&input); @@ -401,7 +416,7 @@ static void test_readerinput(void) hr = IXmlReader_SetInput(reader, reader_input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Initial, FALSE); + test_read_sate(reader, XmlReadState_Initial, -1, FALSE); /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); @@ -416,7 +431,7 @@ static void test_readerinput(void) hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_read_sate(reader, XmlReadState_Closed, FALSE); + test_read_sate(reader, XmlReadState_Initial, XmlReadState_Closed, FALSE); IXmlReader_Release(reader); @@ -473,7 +488,7 @@ static void test_readerinput(void) ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); - test_read_sate(reader, XmlReadState_Closed, FALSE); + test_read_sate(reader, XmlReadState_Closed, -1, FALSE); ref = IUnknown_AddRef(input); ok(ref == 3, "Expected 3, got %d\n", ref); @@ -545,7 +560,7 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_pos(reader, 0, 0, FALSE); + ok_pos(reader, 0, 0, -1, -1, FALSE); type = -1; hr = IXmlReader_Read(reader, &type); @@ -554,16 +569,17 @@ todo_wine { ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); } - ok_pos(reader, 1, 55, TRUE); + /* new version 1.2.x and 1.3.x properly update postition for <?xml ?> */ + ok_pos(reader, 1, 3, -1, 55, TRUE); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_pos(reader, 1, 55, TRUE); + ok_pos(reader, 1, 7, -1, 55, TRUE); hr = IXmlReader_MoveToFirstAttribute(reader); todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_pos(reader, 1, 55, TRUE); + ok_pos(reader, 1, 7, -1, 55, TRUE); hr = IXmlReader_GetAttributeCount(reader, &count); todo_wine {

1 0

Nikolay Sivov : xmllite/tests: Add test for XML declaration parsing.
by Alexandre Julliard Jan. 26, 2010

Jan. 26, 2010

Module: wine Branch: master Commit: 07e2730c0e807854cd4b39dbd2a6b61ae4e5c4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e2730c0e807854cd4b39dbd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jan 25 21:55:02 2010 +0300 xmllite/tests: Add test for XML declaration parsing. --- dlls/xmllite/reader.c | 26 +++++++- dlls/xmllite/tests/reader.c | 141 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ee4a00c..89dcf1d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -44,6 +44,7 @@ typedef struct _xmlreader ISequentialStream *stream;/* stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ XmlReadState state; + UINT line, pos; /* reader position in XML stream */ } xmlreader; typedef struct _xmlreaderinput @@ -132,6 +133,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->stream = NULL; } + This->line = This->pos = 0; + /* just reset current input */ if (!input) { @@ -298,14 +301,28 @@ static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) { - FIXME("(%p %p): stub\n", iface, lineNumber); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p %p)\n", This, lineNumber); + + if (!lineNumber) return E_INVALIDARG; + + *lineNumber = This->line; + + return S_OK; } static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *linePosition) { - FIXME("(%p %p): stub\n", iface, linePosition); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p %p)\n", This, linePosition); + + if (!linePosition) return E_INVALIDARG; + + *linePosition = This->pos; + + return S_OK; } static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *attributeCount) @@ -447,6 +464,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; + reader->line = reader->pos = 0; *pObject = &reader->lpVtbl; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 18ae499..c594d48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -51,6 +51,51 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static const char xmldecl_full[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; + +static IStream *create_stream_on_data(const char *data, int size) +{ + IStream *stream = NULL; + HGLOBAL hglobal; + void *ptr; + HRESULT hr; + + hglobal = GlobalAlloc(GHND, size); + ptr = GlobalLock(hglobal); + + memcpy(ptr, data, size); + + hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(stream != NULL, "Expected non-NULL stream\n"); + + GlobalUnlock(hglobal); + + return stream; +} + +static void ok_pos_(IXmlReader *reader, int line, int pos, int todo, int _line_) +{ + UINT l, p; + HRESULT hr; + + hr = IXmlReader_GetLineNumber(reader, &l); + ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXmlReader_GetLinePosition(reader, &p); + ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + if (todo) + todo_wine + ok_(__FILE__, _line_)(l == line && pos == p, + "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); + else + { + ok_(__FILE__, _line_)(l == line && pos == p, + "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); + } +} +#define ok_pos(reader, l, p, todo) ok_pos_(reader, l, p, todo, __LINE__) + typedef struct input_iids_t { IID iids[10]; int count; @@ -132,6 +177,43 @@ static const char *state_to_str(XmlReadState state) } } +static const char *type_to_str(XmlNodeType type) +{ + static const char* type_names[] = { + "XmlNodeType_None", + "XmlNodeType_Element", + "XmlNodeType_Attribute", + "XmlNodeType_Text", + "XmlNodeType_CDATA", + "XmlNodeType_ProcessingInstruction", + "XmlNodeType_Comment", + "XmlNodeType_DocumentType", + "XmlNodeType_Whitespace", + "XmlNodeType_EndElement", + "XmlNodeType_XmlDeclaration" + }; + + static const char unknown[] = "unknown"; + + switch (type) + { + case XmlNodeType_None: + case XmlNodeType_Element: + case XmlNodeType_Attribute: + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_ProcessingInstruction: + case XmlNodeType_Comment: + case XmlNodeType_DocumentType: + case XmlNodeType_Whitespace: + case XmlNodeType_EndElement: + case XmlNodeType_XmlDeclaration: + return type_names[type]; + default: + return unknown; + } +} + static void test_read_state_(IXmlReader *reader, XmlReadState expected, int todo, int line) { XmlReadState state; @@ -438,6 +520,64 @@ static void test_reader_state(void) IXmlReader_Release(reader); } +static void test_read_xmldeclaration(void) +{ + IXmlReader *reader; + IStream *stream; + HRESULT hr; + XmlNodeType type; + UINT count = 0; + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* position methods with Null args */ + hr = IXmlReader_GetLineNumber(reader, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXmlReader_GetLinePosition(reader, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); + + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + ok_pos(reader, 0, 0, FALSE); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_XmlDeclaration, + "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); +} + ok_pos(reader, 1, 55, TRUE); + + /* check attributes */ + hr = IXmlReader_MoveToNextAttribute(reader); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_pos(reader, 1, 55, TRUE); + + hr = IXmlReader_MoveToFirstAttribute(reader); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_pos(reader, 1, 55, TRUE); + + hr = IXmlReader_GetAttributeCount(reader, &count); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(count == 3, "Expected 3, got %d\n", count); +} + hr = IXmlReader_GetDepth(reader, &count); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(count == 1, "Expected 1, got %d\n", count); +} + + IStream_Release(stream); + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -454,6 +594,7 @@ START_TEST(reader) test_reader_create(); test_readerinput(); test_reader_state(); + test_read_xmldeclaration(); CoUninitialize(); }

1 0