May 2013 - Wine-Commits - list.winehq.org

Jacek Caban : ole32: Added IExternalConnection support.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: a30cc75fe08b0d1a35af009fbbdf61fa87b79061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30cc75fe08b0d1a35af009fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 13:21:12 2013 +0200 ole32: Added IExternalConnection support. --- dlls/ole32/compobj_private.h | 2 ++ dlls/ole32/stubmanager.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f2c9d31..c4379cb 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -98,6 +98,8 @@ struct stub_manager ULONG next_ipid; /* currently unused (LOCK) */ OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ + IExternalConnection *extern_conn; + /* We need to keep a count of the outstanding marshals, so we can enforce the * marshalling rules (ie, you can only unmarshal normal marshals once). Note * that these counts do NOT include unmarshalled interfaces, once a stream is diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index e7018b9..822b299 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -173,6 +173,7 @@ struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHL struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) { struct stub_manager *sm; + HRESULT hres; assert( apt ); @@ -218,6 +219,16 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) */ sm->extrefs = 0; + /* + * NOTE: According to tests, creating a stub causes two AddConnection calls followed by + * one ReleaseConnection call (with fLastReleaseCloses=FALSE). + */ + hres = IUnknown_QueryInterface(object, &IID_IExternalConnection, (void**)&sm->extern_conn); + if(SUCCEEDED(hres)) + IExternalConnection_AddConnection(sm->extern_conn, EXTCONN_STRONG, 0); + else + sm->extern_conn = NULL; + EnterCriticalSection(&apt->cs); sm->oid = apt->oidc++; list_add_head(&apt->stubmgrs, &sm->entry); @@ -242,6 +253,11 @@ static void stub_manager_delete(struct stub_manager *m) stub_manager_delete_ifstub(m, ifstub); } + if(m->extern_conn) { + IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE); + IExternalConnection_Release(m->extern_conn); + } + CoTaskMemFree(m->oxid_info.psa); IUnknown_Release(m->object);

1 0

Roderick Colenbrander : winex11: Store opengl swap interval with gl_drawable.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: 1f47580e9ccc9c22435d3933528d89cceb17858b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f47580e9ccc9c22435d39335… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat May 11 17:55:18 2013 -0700 winex11: Store opengl swap interval with gl_drawable. --- dlls/opengl32/tests/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 066b026..3aa2c40 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1581,7 +1581,7 @@ static void test_swap_control(HDC oldhdc) * is not global or shared among contexts. */ interval = pwglGetSwapIntervalEXT(); - todo_wine ok(interval == 1, "Expected swap interval 1, got %d\n", interval); + ok(interval == 1, "Expected swap interval 1, got %d\n", interval); ret = wglDeleteContext(ctx1); ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c617245..05b8f60 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -251,6 +251,7 @@ struct gl_drawable const struct wgl_pixel_format *format; /* pixel format for the drawable */ XVisualInfo *visual; /* information about the GL visual */ RECT rect; /* drawable rect, relative to whole window drawable */ + int swap_interval; }; /* X context to associate a struct gl_drawable to an hwnd */ @@ -271,7 +272,6 @@ static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static int use_render_texture_emulation = 1; static BOOL has_swap_control; -static int swap_interval = 1; static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1223,6 +1223,10 @@ static void free_gl_drawable( struct gl_drawable *gl ) static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) { gl->drawable = 0; + /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI + * there is no way to query it, so we have to store it here. + */ + gl->swap_interval = 1; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { @@ -2866,9 +2870,24 @@ static const GLubyte *X11DRV_wglGetExtensionsStringEXT(void) */ static int X11DRV_wglGetSwapIntervalEXT(void) { - /* GLX_SGI_swap_control doesn't have any provisions for getting the swap - * interval, so the swap interval has to be tracked. */ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + struct gl_drawable *gl; + int swap_interval; + TRACE("()\n"); + + if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) + { + /* This can't happen because a current WGL context is required to get + * here. Likely the application is buggy. + */ + WARN("No GL drawable found, returning swap interval 0\n"); + return 0; + } + + swap_interval = gl->swap_interval; + release_gl_drawable(gl); + return swap_interval; } @@ -2879,6 +2898,8 @@ static int X11DRV_wglGetSwapIntervalEXT(void) */ static BOOL X11DRV_wglSwapIntervalEXT(int interval) { + struct wgl_context *ctx = NtCurrentTeb()->glContext; + struct gl_drawable *gl; BOOL ret = TRUE; TRACE("(%d)\n", interval); @@ -2888,13 +2909,20 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) SetLastError(ERROR_INVALID_DATA); return FALSE; } - else if (!has_swap_control && interval == 0) + + if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) + { + SetLastError(ERROR_DC_NOT_FOUND); + return FALSE; + } + + if (!has_swap_control && interval == 0) { /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a * value to be an error. Just silently ignore the request for now. */ WARN("Request to disable vertical sync is not handled\n"); - swap_interval = 0; + gl->swap_interval = 0; } else { @@ -2904,11 +2932,13 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) WARN("GLX_SGI_swap_control extension is not available\n"); if (ret) - swap_interval = interval; + gl->swap_interval = interval; else SetLastError(ERROR_DC_NOT_FOUND); } + release_gl_drawable(gl); + return ret; }

1 0

Jacek Caban : oleaut32: Added IExternalConnection tests.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: a047b2cb6f1a0ce0082ef6fe5bce9e2dcb124ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=a047b2cb6f1a0ce0082ef6fe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 13:21:29 2013 +0200 oleaut32: Added IExternalConnection tests. --- dlls/oleaut32/tests/tmarshal.c | 203 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 11 ++ 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2c1b8e8..3572bbb 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -151,6 +151,60 @@ static void end_host_object(DWORD tid, HANDLE thread) CloseHandle(thread); } +static int external_connections; + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + ok(0, "unxpected call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + return 2; +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + return 1; +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + trace("add connection\n"); + + ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + ok(!reserved, "reserved = %x\n", reserved); + return ++external_connections; +} + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + trace("release connection\n"); + + ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + ok(!reserved, "reserved = %x\n", reserved); + + /* This may need to be adjusted if we'll add more complex tests. */ + if(--external_connections) + ok(!fLastReleaseCloses, "fLastReleaseCloses = %x\n", fLastReleaseCloses); + else + ok(fLastReleaseCloses, "fLastReleaseCloses = %x\n", fLastReleaseCloses); + return external_connections; +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + +static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; + static ItestDual TestDual, TestDualDisp; static HRESULT WINAPI TestSecondIface_QueryInterface(ITestSecondIface *iface, REFIID riid, void **ppv) @@ -182,6 +236,67 @@ static const ITestSecondIfaceVtbl TestSecondIfaceVtbl = { static ITestSecondIface TestSecondIface = { &TestSecondIfaceVtbl }; +static HRESULT WINAPI TestSecondDisp_QueryInterface(ITestSecondDisp *iface, REFIID riid, void **ppv) +{ + return ItestDual_QueryInterface(&TestDual, riid, ppv); +} + +static ULONG WINAPI TestSecondDisp_AddRef(ITestSecondDisp *iface) +{ + return 2; +} + +static ULONG WINAPI TestSecondDisp_Release(ITestSecondDisp *iface) +{ + return 1; +} + +static HRESULT WINAPI TestSecondDisp_GetTypeInfoCount(ITestSecondDisp *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_GetTypeInfo(ITestSecondDisp *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_GetIDsOfNames(ITestSecondDisp *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_Invoke(ITestSecondDisp *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_test(ITestSecondDisp *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ITestSecondDispVtbl TestSecondDispVtbl = { + TestSecondDisp_QueryInterface, + TestSecondDisp_AddRef, + TestSecondDisp_Release, + TestSecondDisp_GetTypeInfoCount, + TestSecondDisp_GetTypeInfo, + TestSecondDisp_GetIDsOfNames, + TestSecondDisp_Invoke, + TestSecondDisp_test +}; + +static ITestSecondDisp TestSecondDisp = { &TestSecondDispVtbl }; + static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, void **ppvObject) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { @@ -193,6 +308,13 @@ static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_ITestSecondIface)) { *ppvObject = &TestSecondIface; return S_OK; + }else if(IsEqualGUID(riid, &IID_ITestSecondDisp)) { + *ppvObject = &TestSecondDisp; + return S_OK; + }else if (IsEqualGUID(riid, &IID_IExternalConnection)) { + trace("QI external connection\n"); + *ppvObject = &ExternalConnection; + return S_OK; } *ppvObject = NULL; @@ -1704,6 +1826,86 @@ static void test_libattr(void) ITypeLib_Release(pTypeLib); } +static void test_external_connection(void) +{ + IStream *stream, *stream2; + ITestSecondDisp *second; + ItestDual *iface; + HANDLE thread; + DWORD tid; + HRESULT hres; + + static const LARGE_INTEGER zero; + + trace("Testing IExternalConnection...\n"); + + external_connections = 0; + + /* Marshaling an interface increases external connection count. */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + tid = start_host_object(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHLFLAGS_NORMAL, &thread); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); + ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Release(stream); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + /* Creating a stub for new iface does not cause new external connection. */ + hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second); + ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + ITestSecondDisp_Release(second); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + ItestDual_Release(iface); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + + end_host_object(tid, thread); + + /* A test with direct CoMarshalInterface call. */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + + hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + + /* Two separated marshal data are still one external connection. */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream2); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + hres = CoMarshalInterface(stream2, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream2); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + +} + START_TEST(tmarshal) { HRESULT hr; @@ -1724,6 +1926,7 @@ START_TEST(tmarshal) test_DispCallFunc(); test_StaticWidget(); test_libattr(); + test_external_connection(); hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 8dca84c..0f0186b 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -75,6 +75,17 @@ library TestTypelib [ odl, + oleautomation, + dual, + uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7967) + ] + interface ITestSecondDisp : IDispatch + { + HRESULT test(); + } + + [ + odl, uuid(a1f8cae3-c947-4c5f-b57d-c87b9b5f3586), oleautomation, dual

1 0

Alexandre Julliard : ntdll: Make the entire relay entry point routine CPU-specific.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: f4e58868d499489d6c6e560fed85231eaa36263c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e58868d499489d6c6e560fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:45:39 2013 +0200 ntdll: Make the entire relay entry point routine CPU-specific. --- dlls/ntdll/relay.c | 291 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 166 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e58868d499489d6c6e5…

1 0

André Hentschel : advapi32/tests: Fix copy&paste typo.
by Alexandre Julliard May 23, 2013

May 23, 2013

Module: wine Branch: master Commit: 1510838d1f166a1343b144c34930aaab42b992a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1510838d1f166a1343b144c34… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 23 00:45:08 2013 +0200 advapi32/tests: Fix copy&paste typo. --- dlls/advapi32/tests/registry.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b2483a7..1784118 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2156,16 +2156,16 @@ static void test_classesroot(void) ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* try to find the value in user's classes */ - res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); + res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); /* modify the value in user's classes */ - res = RegSetValueExA(hkcr, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + res = RegSetValueExA(hkey, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check if the value is also modified in hkcr */ - res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); + res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer );

1 0

Jacek Caban : ieframe: Fixed handling documents that don' t report their ready state.
by Alexandre Julliard May 22, 2013

May 22, 2013

Module: wine Branch: master Commit: 2c6b5d33d1417e9db4e3b93aa95e155d1918c1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6b5d33d1417e9db4e3b93aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 16:08:54 2013 +0200 ieframe: Fixed handling documents that don't report their ready state. --- dlls/ieframe/dochost.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 76b8950..8c5d4b5 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -310,6 +310,10 @@ HRESULT dochost_object_available(DocHost *This, IUnknown *doc) push_ready_state_task(This, READYSTATE_COMPLETE); if(ready_state != READYSTATE_COMPLETE || This->doc_navigate) advise_prop_notif(This, TRUE); + }else if(!This->doc_navigate) { + /* If we can't get document's ready state, there is not much we can do. + * Assume that document is complete at this point. */ + push_ready_state_task(This, READYSTATE_COMPLETE); } return S_OK;

1 0

Andrew Eikum : gdiplus: Implement GdipResetImageAttributes.
by Alexandre Julliard May 22, 2013

May 22, 2013

Module: wine Branch: master Commit: 2b8b64f9abc2575da7e7beb3adb310ccf98cfcac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8b64f9abc2575da7e7beb3a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 22 11:12:18 2013 -0500 gdiplus: Implement GdipResetImageAttributes. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 17 ++++++++++ dlls/gdiplus/tests/image.c | 65 +++++++++++++++++++++++++++++++++++++-- include/gdiplusflat.h | 2 + 4 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4f30ed1..cee3ea6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -455,7 +455,7 @@ 455 stdcall GdipReleaseDC(ptr ptr) 456 stdcall GdipRemovePropertyItem(ptr long) 457 stdcall GdipResetClip(ptr) -458 stub GdipResetImageAttributes +458 stdcall GdipResetImageAttributes(ptr long) 459 stdcall GdipResetLineTransform(ptr) 460 stdcall GdipResetPageTransform(ptr) 461 stdcall GdipResetPath(ptr) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index bd5c082..0b09547 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -270,3 +270,20 @@ GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes *imageAtt return NotImplemented; } + +GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes *imageAttr, + ColorAdjustType type) +{ + TRACE("(%p,%u)\n", imageAttr, type); + + if(!imageAttr || type >= ColorAdjustTypeCount) + return InvalidParameter; + + memset(&imageAttr->colorkeys[type], 0, sizeof(imageAttr->colorkeys[type])); + memset(&imageAttr->colormatrices[type], 0, sizeof(imageAttr->colormatrices[type])); + memset(&imageAttr->colorremaptables[type], 0, sizeof(imageAttr->colorremaptables[type])); + memset(&imageAttr->gamma_enabled[type], 0, sizeof(imageAttr->gamma_enabled[type])); + memset(&imageAttr->gamma[type], 0, sizeof(imageAttr->gamma[type])); + + return Ok; +} diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6b4a34c..18e159b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2211,6 +2211,17 @@ static void test_colormatrix(void) expect(Ok, stat); ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08x\n", color); + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 1), "Expected ff40ccee, got %.8x\n", color); + GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1); GdipDisposeImage((GpImage*)bitmap2); @@ -2273,6 +2284,17 @@ static void test_gamma(void) expect(Ok, stat); ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color); + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff80ffff, color, 1), "Expected ff80ffff, got %.8x\n", color); + GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1); GdipDisposeImage((GpImage*)bitmap2); @@ -2604,6 +2626,17 @@ static void test_remaptable(void) expect(Ok, stat); ok(color_match(0xffff00ff, color, 1), "Expected ffff00ff, got %.8x\n", color); + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff00ff00, color, 1), "Expected ff00ff00, got %.8x\n", color); + GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1); GdipDisposeImage((GpImage*)bitmap2); @@ -2661,19 +2694,43 @@ static void test_colorkey(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8x\n", color); stat = GdipBitmapGetPixel(bitmap2, 0, 1, &color); expect(Ok, stat); - ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8x\n", color); stat = GdipBitmapGetPixel(bitmap2, 1, 0, &color); expect(Ok, stat); - ok(color_match(0x00000000, color, 1), "Expected ffff00ff, got %.8x\n", color); + ok(color_match(0x00000000, color, 1), "Expected 00000000, got %.8x\n", color); stat = GdipBitmapGetPixel(bitmap2, 1, 1, &color); expect(Ok, stat); - ok(color_match(0xffffffff, color, 1), "Expected ffff00ff, got %.8x\n", color); + ok(color_match(0xffffffff, color, 1), "Expected ffffffff, got %.8x\n", color); + + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,2,2, 0,0,2,2, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0x20405060, color, 1), "Expected 20405060, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 0, 1, &color); + expect(Ok, stat); + ok(color_match(0x40506070, color, 1), "Expected 40506070, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 1, 0, &color); + expect(Ok, stat); + ok(color_match(0x60708090, color, 1), "Expected 60708090, got %.8x\n", color); + + stat = GdipBitmapGetPixel(bitmap2, 1, 1, &color); + expect(Ok, stat); + ok(color_match(0xffffffff, color, 1), "Expected ffffffff, got %.8x\n", color); + GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c622431..0753585 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -458,6 +458,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes*, ColorAdjustType); GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, ARGB,BOOL); +GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes*, + ColorAdjustType); /* LinearGradientBrush */ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*,

1 0

Jacek Caban : ieframe: Use IOleObject:: DoVerb if IHlink interface is not available.
by Alexandre Julliard May 22, 2013

May 22, 2013

Module: wine Branch: master Commit: 14ad0a1a842eab9e7c53c3c46dc1164cac8cdc52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ad0a1a842eab9e7c53c3c46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 16:08:40 2013 +0200 ieframe: Use IOleObject::DoVerb if IHlink interface is not available. --- dlls/ieframe/dochost.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c717d8b..76b8950 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -121,15 +121,29 @@ static void object_available(DocHost *This) } hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); - if(FAILED(hres)) { - FIXME("Could not get IHlinkTarget interface\n"); - return; - } + if(SUCCEEDED(hres)) { + hres = IHlinkTarget_Navigate(hlink, 0, NULL); + IHlinkTarget_Release(hlink); + if(FAILED(hres)) + FIXME("Navigate failed\n"); + }else { + IOleObject *ole_object; + RECT rect; - hres = IHlinkTarget_Navigate(hlink, 0, NULL); - IHlinkTarget_Release(hlink); - if(FAILED(hres)) - FIXME("Navigate failed\n"); + TRACE("No IHlink iface\n"); + + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&ole_object); + if(FAILED(hres)) { + FIXME("Could not get IOleObject iface: %08x\n", hres); + return; + } + + GetClientRect(This->hwnd, &rect); + hres = IOleObject_DoVerb(ole_object, OLEIVERB_SHOW, NULL, &This->IOleClientSite_iface, -1, This->hwnd, &rect); + IOleObject_Release(ole_object); + if(FAILED(hres)) + FIXME("DoVerb failed: %08x\n", hres); + } } static HRESULT get_doc_ready_state(DocHost *This, READYSTATE *ret)

1 0

Akihiro Sagawa : gdi32: Add a helper to get the default character index.
by Alexandre Julliard May 22, 2013

May 22, 2013

Module: wine Branch: master Commit: f6ea5c8a0f94c03d88376e69db31ead707ae4028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ea5c8a0f94c03d88376e69d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 22 19:46:28 2013 +0900 gdi32: Add a helper to get the default character index. --- dlls/gdi32/freetype.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bc43772..50bd52b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5817,6 +5817,25 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return glyphId; } +static FT_UInt get_default_char_index(GdiFont *font) +{ + FT_UInt default_char; + + if (FT_IS_SFNT(font->ft_face)) + { + TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); + default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); + } + else + { + TEXTMETRICW textm; + get_text_metrics(font, &textm); + default_char = textm.tmDefaultChar; + } + + return default_char; +} + /************************************************************* * freetype_GetGlyphIndices */ @@ -5849,17 +5868,7 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP { if (!got_default) { - if (FT_IS_SFNT(physdev->font->ft_face)) - { - TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(physdev->font->ft_face, ft_sfnt_os2); - default_char = (pOS2->usDefaultChar ? get_glyph_index(physdev->font, pOS2->usDefaultChar) : 0); - } - else - { - TEXTMETRICW textm; - get_text_metrics(physdev->font, &textm); - default_char = textm.tmDefaultChar; - } + default_char = get_default_char_index(physdev->font); got_default = TRUE; } pgi[i] = default_char;

1 0

Christian Costa : d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator .
by Alexandre Julliard May 22, 2013

May 22, 2013

Module: wine Branch: master Commit: e7c3b03531a9642cb8cce81322906c0281fa5928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c3b03531a9642cb8cce8132… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 21 20:02:03 2013 +0200 d3dxof: Cleanup separators handling and allow multi-semicolons + single comma separator. --- dlls/d3dxof/parsing.c | 42 ++++++++++++++++-------------------------- dlls/d3dxof/tests/d3dxof.c | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 37cf2e1..2faf7a2 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1141,6 +1141,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { ULONG k; ULONG nb_elems = 1; + BOOL basic_type = TRUE; buf->pxo->members[i].name = pt->members[i].name; buf->pxo->members[i].start = buf->cur_pos_data; @@ -1157,26 +1158,12 @@ static BOOL parse_object_members_list(parse_buffer * buf) for (k = 0; k < nb_elems; k++) { - if (buf->txt && k) - { - token = check_TOKEN(buf); - if (token == TOKEN_COMMA) - { - get_TOKEN(buf); - } - else - { - /* Allow comma omission */ - if (!((token == TOKEN_FLOAT) || (token == TOKEN_INTEGER))) - return FALSE; - } - } - if (pt->members[i].type == TOKEN_NAME) { ULONG j; TRACE("Found sub-object %s\n", buf->pdxf->xtemplates[pt->members[i].idx_template].name); + basic_type = FALSE; buf->level++; /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) @@ -1270,23 +1257,26 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } else - { + { FIXME("Unexpected token %d\n", token); return FALSE; } } - } - - /* Empty arrays can have the semicolon at the end or not so remove it if any and skip next check */ - if (!nb_elems && (check_TOKEN(buf) == TOKEN_SEMICOLON)) - get_TOKEN(buf); - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) - { - token = get_TOKEN(buf); - if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) - return FALSE; + if (basic_type) + { + /* Handle separator only for basic types */ + token = check_TOKEN(buf); + if ((token != TOKEN_COMMA) && (token != TOKEN_SEMICOLON)) + return FALSE; + /* Allow multi-semicolons + single comma separator */ + while (check_TOKEN(buf) == TOKEN_SEMICOLON) + get_TOKEN(buf); + if (check_TOKEN(buf) == TOKEN_COMMA) + get_TOKEN(buf); + } } + buf->pxo->members[i].size = buf->cur_pos_data - buf->pxo->members[i].start; } diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 52012d7..ecd4ba5 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -865,24 +865,24 @@ static void test_syntax_semicolon_comma(void) /* Test semicolon separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_semicolon_txt, sizeof(object_syntax_semicolon_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test semicolon separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_semicolon_bin, sizeof(object_syntax_semicolon_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_comma_txt, sizeof(object_syntax_comma_txt) - 1); ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_comma_bin, sizeof(object_syntax_comma_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_bin, sizeof(object_syntax_multi_semicolons_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-commas separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_commas_txt, sizeof(object_syntax_multi_semicolons_txt) - 1); @@ -893,10 +893,10 @@ static void test_syntax_semicolon_comma(void) /* Test multi-semicolons + single comma separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_txt, sizeof(object_syntax_multi_semicolons_and_comma_txt) - 1); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test multi-semicolons + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_multi_semicolons_and_comma_bin, sizeof(object_syntax_multi_semicolons_and_comma_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test comma + semicolon separators in text mode */ ret = test_buffer_object(dxfile, object_syntax_comma_and_semicolon_txt, sizeof(object_syntax_comma_and_semicolon_txt) - 1); @@ -907,14 +907,14 @@ static void test_syntax_semicolon_comma(void) /* Test no ending separator in text mode */ ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_txt, sizeof(object_syntax_no_ending_separator_txt) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no ending separator in binary mode */ ret = test_buffer_object(dxfile, object_syntax_no_ending_separator_bin, sizeof(object_syntax_no_ending_separator_bin)); ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no array separator in text mode */ ret = test_buffer_object(dxfile, object_syntax_array_no_separator_txt, sizeof(object_syntax_array_no_separator_txt) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test no array separator in binary mode */ ret = test_buffer_object(dxfile, object_syntax_array_no_separator_bin, sizeof(object_syntax_array_no_separator_bin)); ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); @@ -925,11 +925,11 @@ static void test_syntax_semicolon_comma(void) /* Test object with mixed integer list and integers + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); - ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test integer list followed by a semicolon in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin)); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "test_buffer_object returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); /* Test integer list followed by a comma in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_comma_bin, sizeof(object_syntax_integer_list_comma_bin));

1 0