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

Austin English : dwmapi: Add DwmSetPresentParameters stub.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: a717598b75b81f776e3fe51372651046cd24f955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a717598b75b81f776e3fe5137… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 28 17:45:17 2016 -0600 dwmapi: Add DwmSetPresentParameters stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ include/dwmapi.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 531f279..6adbcb9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,7 +39,7 @@ @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration -@ stub DwmSetPresentParameters +@ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) @ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index a776cfe..155d7d3 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -259,3 +259,12 @@ HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUM FIXME("(%p, %p) stub\n", thumbnail, props); return E_NOTIMPL; } + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; diff --git a/include/dwmapi.h b/include/dwmapi.h index 035c831..f5191e1 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -37,6 +37,12 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -117,6 +123,17 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); @@ -129,6 +146,7 @@ DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *);

1 0

Alexandre Julliard : winebuild: Add a common helper to find an imported dll.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 59b5c52f1dc57cf7ef525d9d958e09684bb04e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b5c52f1dc57cf7ef525d9d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 16:50:44 2016 +0900 winebuild: Add a common helper to find an imported dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 69d4765..1d561c4 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -154,15 +154,15 @@ static int is_delayed_import( const char *name ) return 0; } -/* check whether a given dll has already been imported */ -static struct import *is_already_imported( const char *name ) +/* find an imported dll from its name */ +static struct import *find_import_dll( const char *name ) { struct import *import; LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) - if (!strcmp( import->dll_name, name )) return import; + if (!strcasecmp( import->dll_name, name )) return import; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) - if (!strcmp( import->dll_name, name )) return import; + if (!strcasecmp( import->dll_name, name )) return import; return NULL; } @@ -215,7 +215,7 @@ static DLLSPEC *read_import_lib( struct import *imp ) close_input_file( f ); /* check if we already imported that library from a different file */ - if ((prev_imp = is_already_imported( spec->file_name ))) + if ((prev_imp = find_import_dll( spec->file_name ))) { if (prev_imp->dev != imp->dev || prev_imp->ino != imp->ino) fatal_error( "%s and %s have the same export name '%s'\n", @@ -292,7 +292,7 @@ void add_delayed_import( const char *name ) char *fullname = get_dll_name( name, NULL ); strarray_add( &delayed_imports, fullname, NULL ); - if ((imp = is_already_imported( fullname ))) + if ((imp = find_import_dll( fullname ))) { list_remove( &imp->entry ); list_add_tail( &dll_delayed, &imp->entry ); @@ -389,25 +389,14 @@ static void check_undefined_forwards( DLLSPEC *spec ) api_name = p + 1; dll_name = get_dll_name( link_name, NULL ); - LIST_FOR_EACH_ENTRY( imp, &dll_imports, struct import, entry ) + if ((imp = find_import_dll( dll_name ))) { - if (strcasecmp( imp->dll_name, dll_name )) continue; if (!find_export( api_name, imp->exports, imp->nb_exports )) warning( "%s:%d: forward '%s' not found in %s\n", spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); - goto done; } - LIST_FOR_EACH_ENTRY( imp, &dll_delayed, struct import, entry ) - { - if (strcasecmp( imp->dll_name, dll_name )) continue; - if (!find_export( api_name, imp->exports, imp->nb_exports )) - warning( "%s:%d: forward '%s' not found in %s\n", - spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); - goto done; - } - warning( "%s:%d: forward '%s' not found in the imported dll list\n", - spec->src_name, odp->lineno, odp->link_name ); - done: + else warning( "%s:%d: forward '%s' not found in the imported dll list\n", + spec->src_name, odp->lineno, odp->link_name ); free( link_name ); free( dll_name ); }

1 0

Jacek Caban : mshtml/tests: Fixed remaining xmlhttprequest test failures.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: f24526e79f1c57e559c3a35ab69b85dabc57d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24526e79f1c57e559c3a35ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 10:31:14 2016 +0100 mshtml/tests: Fixed remaining xmlhttprequest test failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 3153804..7e75b79 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -566,7 +566,7 @@ static void test_responseXML(const char *expect_text) ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08x\n", supported); - ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), + ok(enabled == ((INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) & supported), "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08x\n", enabled); IObjectSafety_Release(safety); @@ -585,9 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Accept-Ranges", "bytes"}, + {"Accept-Ranges", "bytes", TRUE}, {"Content-Length", "51"}, - {"Content-Type", "application/xml", TRUE} + {"Content-Type", "application/xml"} }; trace("test_sync_xhr\n");

1 0

Piotr Caban : msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 97567074a5c221a1fc1db221b3e74015b7d43e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97567074a5c221a1fc1db221b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 23 10:44:08 2016 +0100 msvcrt: Update previous exception stored in cxx_frame_info after frames unwinding. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 3debece..dd807c4 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -412,6 +412,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; + thread_data_t *data; for (i = 0; i < descr->tryblock_count; i++) { @@ -452,7 +453,10 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; - msvcrt_get_thread_data()->exc_record = rec; + + data = msvcrt_get_thread_data(); + nested_frame.frame_info.rec = data->exc_record; + data->exc_record = rec; /* call the catch block */ TRACE( "calling catch block %p addr %p ebp %p\n",

1 0

Nikolay Sivov : oleaut32/tests: Fix a test crash on some XP SP1 VM.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 1c3127c68d52c431011d1d9ce5213bae5763adf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3127c68d52c431011d1d9ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:06:37 2016 +0300 oleaut32/tests: Fix a test crash on some XP SP1 VM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index fcce92e..b795d52 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5710,19 +5710,23 @@ static void test_LoadRegTypeLib(void) hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); + tl = NULL; hr = LoadRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &tl); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITypeLib_GetLibAttr(tl, &attr); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (tl) + { + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); - ok(attr->lcid == 0, "got %x\n", attr->lcid); - ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); - ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); - ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); + ok(attr->lcid == 0, "got %x\n", attr->lcid); + ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); + ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); - ITypeLib_ReleaseTLibAttr(tl, attr); - ITypeLib_Release(tl); + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); + } DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb");

1 0

Nikolay Sivov : xmllite/tests: A test for Write* behaviour on initial writer state.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 8ad295ed709f894359d531391e66970386e72093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad295ed709f894359d531391… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:26 2016 +0300 xmllite/tests: A test for Write* behaviour on initial writer state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 4071d61..2015109 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -54,6 +54,85 @@ static void check_output(IStream *stream, const char *expected, int line) } #define CHECK_OUTPUT(stream, expected) check_output(stream, expected, __LINE__) +/* used to test all Write* methods for consistent error state */ +static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) +{ + static const WCHAR aW[] = {'a',0}; + HRESULT hr; + + /* FIXME: add WriteAttributes */ + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteCData(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteCharEntity(writer, aW[0]); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteChars(writer, aW, 1); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteComment(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + /* FIXME: add WriteDocType */ + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteEndElement(writer); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + +todo_wine { + hr = IXmlWriter_WriteEntityRef(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteName(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteNmToken(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + /* FIXME: add WriteNode */ + /* FIXME: add WriteNodeShallow */ + + hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteRaw(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteRawChars(writer, aW, 1); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteString(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); +} + /* FIXME: add WriteSurrogateCharEntity */ + /* FIXME: add WriteWhitespace */ +} + static IStream *writer_set_output(IXmlWriter *writer) { IStream *stream; @@ -831,9 +910,23 @@ static void test_WriteRaw(void) IStream_Release(stream); } +static void test_writer_state(void) +{ + IXmlWriter *writer; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + check_writer_state(writer, E_UNEXPECTED); + + IXmlWriter_Release(writer); +} + START_TEST(writer) { test_writer_create(); + test_writer_state(); test_writeroutput(); test_writestartdocument(); test_writestartelement();

1 0

Nikolay Sivov : xmllite/writer: Fix initial state handling in WriteEndDocument().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 86a7dd99e003c2dc96b4b37d43620ca79771039b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a7dd99e003c2dc96b4b37d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:27 2016 +0300 xmllite/writer: Fix initial state handling in WriteEndDocument(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 7 +++++-- dlls/xmllite/writer.c | 13 +++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2015109..e6ffbeb 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -104,7 +104,7 @@ todo_wine { hr = IXmlWriter_WriteNmToken(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); - +} /* FIXME: add WriteNode */ /* FIXME: add WriteNodeShallow */ @@ -112,12 +112,14 @@ todo_wine { ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteRaw(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); @@ -127,8 +129,9 @@ todo_wine { ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteString(writer, aW); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); -} + /* FIXME: add WriteSurrogateCharEntity */ /* FIXME: add WriteWhitespace */ } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index dac7f04..90e965f 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -754,28 +754,21 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - HRESULT hr = S_OK; TRACE("%p\n", This); switch (This->state) { case XmlWriterState_Initial: - hr = E_UNEXPECTED; - break; + return E_UNEXPECTED; case XmlWriterState_Ready: case XmlWriterState_DocClosed: - hr = WR_E_INVALIDACTION; - break; + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; default: ; } - if (FAILED(hr)) { - This->state = XmlWriterState_DocClosed; - return hr; - } - /* empty element stack */ while (IXmlWriter_WriteEndElement(iface) == S_OK) ;

1 0

Nikolay Sivov : xmllite/writer: Properly fail on initial state in WriteEndElement().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 6ca1ebdd25756a797c55c4d10b91b3bab61b646d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca1ebdd25756a797c55c4d10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:28 2016 +0300 xmllite/writer: Properly fail on initial state in WriteEndElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 1 - dlls/xmllite/writer.c | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index e6ffbeb..a5d5b31a 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -89,7 +89,6 @@ todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteEndElement(writer); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); todo_wine { diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 90e965f..0e55b42 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -784,6 +784,14 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) TRACE("%p\n", This); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + default: + ; + } + element = pop_element(This); if (!element) return WR_E_INVALIDACTION;

1 0

Nikolay Sivov : xmllite/writer: Fix WriteEndElement()/WriteFullEndElement( ) on ready state.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: e3a6d5932489d1988b0021b88f3c934b7af7e500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a6d5932489d1988b0021b88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:29 2016 +0300 xmllite/writer: Fix WriteEndElement()/WriteFullEndElement() on ready state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 15 ++++++++++++++- dlls/xmllite/writer.c | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index a5d5b31a..ce4e13d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -91,13 +91,14 @@ todo_wine hr = IXmlWriter_WriteEndElement(writer); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); -todo_wine { hr = IXmlWriter_WriteEntityRef(writer, aW); +todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteFullEndElement(writer); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); +todo_wine { hr = IXmlWriter_WriteName(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); @@ -915,13 +916,25 @@ static void test_WriteRaw(void) static void test_writer_state(void) { IXmlWriter *writer; + IStream *stream; HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + /* initial state */ check_writer_state(writer, E_UNEXPECTED); + /* set output and call 'wrong' method */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + + IStream_Release(stream); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 0e55b42..6aa851f 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -788,6 +788,10 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; default: ; } @@ -827,6 +831,18 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) TRACE("%p\n", This); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; + default: + ; + } + element = pop_element(This); if (!element) return WR_E_INVALIDACTION;

1 0

Józef Kucia : d3d10core/tests: Add test for ClearRenderTargetView().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: ceed14231b825024055fb1e29f330a2604496374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceed14231b825024055fb1e29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:49 2016 +0100 d3d10core/tests: Add test for ClearRenderTargetView(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4c41d25..ba6f22e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -228,6 +228,27 @@ static ID3D10Device *create_device(void) return NULL; } +static BOOL is_warp_device(ID3D10Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + HRESULT hr; + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + return !adapter_desc.SubSysId && !adapter_desc.Revision + && ((!adapter_desc.VendorId && !adapter_desc.DeviceId) + || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)); +} + #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 struct swapchain_desc @@ -5858,6 +5879,97 @@ static void test_swapchain_flip(void) DestroyWindow(window); } +static void test_clear_render_target_view(void) +{ + static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + + struct d3d10core_test_context test_context; + ID3D10Texture2D *texture, *srgb_texture; + ID3D10RenderTargetView *rtv, *srgb_rtv; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)srgb_texture, NULL, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, color); + check_texture_color(test_context.backbuffer, expected_color, 1); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture_color(texture, expected_color, 1); + + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + check_texture_color(srgb_texture, expected_srgb_color, 1); + + ID3D10RenderTargetView_Release(srgb_rtv); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(srgb_texture); + ID3D10Texture2D_Release(texture); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv, color); + check_texture_color(texture, expected_color, 1); + + if (!is_warp_device(device)) + { + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + todo_wine check_texture_color(texture, expected_srgb_color, 1); + } + else + { + win_skip("sRGB clears are broken on WARP.\n"); + } + + ID3D10RenderTargetView_Release(srgb_rtv); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_clear_depth_stencil_view(void) { D3D10_TEXTURE2D_DESC texture_desc; @@ -6135,6 +6247,7 @@ START_TEST(device) test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip(); + test_clear_render_target_view(); test_clear_depth_stencil_view(); test_draw_depth_only(); }

1 0