January 2015 - Wine-Commits

Henri Verbeet : wined3d: Create GL sampler objects for wined3d sampler objects.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: c6232e1d111ae8929c53c02211cde4a9777311fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6232e1d111ae8929c53c0221… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:06 2015 +0100 wined3d: Create GL sampler objects for wined3d sampler objects. --- dlls/d3d10core/state.c | 2 +- dlls/wined3d/context.c | 2 ++ dlls/wined3d/device.c | 44 ++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 16 ++++++++++ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/sampler.c | 66 +++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/state.c | 46 +++++++++++++++++++++++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 4 +++ include/wine/wined3d.h | 2 +- 11 files changed, 173 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6232e1d111ae8929c53c…

1 0

Matteo Bruni : opengl32: Update to GL 4.5.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: d6450cfad5618036998385c08aefe830606c1330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6450cfad5618036998385c08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 15 20:00:02 2015 +0100 opengl32: Update to GL 4.5. --- dlls/opengl32/make_opengl | 34 +- dlls/opengl32/opengl_ext.c | 1265 +++++++++++++++++++++++++++++++++++++++++-- dlls/opengl32/opengl_norm.c | 360 +++++++++++- include/wine/wgl.h | 431 ++++++++++++++- include/wine/wgl_driver.h | 179 +++++- 5 files changed, 2181 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6450cfad561803699838…

1 0

Hans Leidekker : wbemdisp: Reimplement ISWbemObjectSet:: get__NewEnum on top of IEnumWbemClassObject::Clone.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 0a6d0d327cb3d53d9b0af8fb8fa00d4415e7cebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6d0d327cb3d53d9b0af8fb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 15 12:43:52 2015 +0100 wbemdisp: Reimplement ISWbemObjectSet::get__NewEnum on top of IEnumWbemClassObject::Clone. --- dlls/wbemdisp/locator.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index c604983..3465eb1 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); -static HRESULT EnumVARIANT_create( ISWbemObjectSet *, IEnumVARIANT ** ); +static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); enum type_id { @@ -489,10 +489,17 @@ static HRESULT WINAPI objectset_get__NewEnum( IUnknown **pUnk ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + IEnumWbemClassObject *objectenum; + HRESULT hr; TRACE( "%p, %p\n", objectset, pUnk ); - return EnumVARIANT_create( iface, (IEnumVARIANT **)pUnk ); + hr = IEnumWbemClassObject_Clone( objectset->objectenum, &objectenum ); + if (FAILED( hr )) return hr; + + hr = EnumVARIANT_create( objectenum, (IEnumVARIANT **)pUnk ); + IEnumWbemClassObject_Release( objectenum ); + return hr; } static HRESULT WINAPI objectset_Item( @@ -581,7 +588,7 @@ struct enumvar { IEnumVARIANT IEnumVARIANT_iface; LONG refs; - ISWbemObjectSet *objectset; + IEnumWbemClassObject *objectenum; }; static inline struct enumvar *impl_from_IEnumVARIANT( @@ -605,7 +612,7 @@ static ULONG WINAPI enumvar_Release( if (!refs) { TRACE( "destroying %p\n", enumvar ); - ISWbemObjectSet_Release( enumvar->objectset ); + IEnumWbemClassObject_Release( enumvar->objectenum ); heap_free( enumvar ); } return refs; @@ -637,13 +644,12 @@ static HRESULT WINAPI enumvar_QueryInterface( static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched ) { struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); - struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); IWbemClassObject *obj; ULONG count = 0; TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); - if (celt) IEnumWbemClassObject_Next( objectset->objectenum, WBEM_INFINITE, 1, &obj, &count ); + if (celt) IEnumWbemClassObject_Next( enumvar->objectenum, WBEM_INFINITE, 1, &obj, &count ); if (count) { ISWbemObject *sobj; @@ -663,21 +669,19 @@ static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *va static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) { struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); - struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); TRACE( "%p, %u\n", iface, celt ); - return IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, celt ); + return IEnumWbemClassObject_Skip( enumvar->objectenum, WBEM_INFINITE, celt ); } static HRESULT WINAPI enumvar_Reset( IEnumVARIANT *iface ) { struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); - struct objectset *objectset = impl_from_ISWbemObjectSet( enumvar->objectset ); TRACE( "%p\n", iface ); - return IEnumWbemClassObject_Reset( objectset->objectenum ); + return IEnumWbemClassObject_Reset( enumvar->objectenum ); } static HRESULT WINAPI enumvar_Clone( IEnumVARIANT *iface, IEnumVARIANT **penum ) @@ -697,15 +701,15 @@ static const struct IEnumVARIANTVtbl enumvar_vtbl = enumvar_Clone }; -static HRESULT EnumVARIANT_create( ISWbemObjectSet *objectset, IEnumVARIANT **obj ) +static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIANT **obj ) { struct enumvar *enumvar; if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; enumvar->refs = 1; - enumvar->objectset = objectset; - ISWbemObjectSet_AddRef( enumvar->objectset ); + enumvar->objectenum = objectenum; + IEnumWbemClassObject_AddRef( enumvar->objectenum ); *obj = &enumvar->IEnumVARIANT_iface; TRACE( "returning iface %p\n", *obj );

1 0

Qian Hong : atl100/tests: Added tests for AtlAxAttachControl.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: e1999c2a0eea1b5cbeda28cd6b59945b702b1f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1999c2a0eea1b5cbeda28cd6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jan 15 17:28:14 2015 +0800 atl100/tests: Added tests for AtlAxAttachControl. --- dlls/atl100/tests/atl.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index dcc199f..6a8bbce 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -25,6 +25,7 @@ #include <windef.h> #include <winbase.h> #include <winuser.h> +#include <exdisp.h> #include <atlbase.h> #include <mshtml.h> @@ -757,8 +758,104 @@ static void test_ax_win(void) todo_wine ok(wndproc[0] != wndproc[1], "expected different proc!\n"); } +static ATOM register_class(void) +{ + WNDCLASSA wndclassA; + + wndclassA.style = 0; + wndclassA.lpfnWndProc = DefWindowProcA; + wndclassA.cbClsExtra = 0; + wndclassA.cbWndExtra = 0; + wndclassA.hInstance = GetModuleHandleA(NULL); + wndclassA.hIcon = NULL; + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); + wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + wndclassA.lpszMenuName = NULL; + wndclassA.lpszClassName = "WineAtlTestClass"; + + return RegisterClassA(&wndclassA); +} + +static HWND create_container_window(void) +{ + return CreateWindowA("WineAtlTestClass", "Wine ATL Test Window", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, NULL, NULL); +} + +static void test_AtlAxAttachControl(void) +{ + HWND hwnd; + HRESULT hr; + IUnknown *control, *container; + LONG val; + + hr = AtlAxAttachControl(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + + container = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, NULL, &container); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(container == (IUnknown *)0xdeadbeef, + "Expected the output container pointer to be untouched, got %p\n", container); + + hwnd = create_container_window(); + hr = AtlAxAttachControl(NULL, hwnd, NULL); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + DestroyWindow(hwnd); + + hwnd = create_container_window(); + container = (IUnknown *)0xdeadbeef; + hr = AtlAxAttachControl(NULL, hwnd, &container); + ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); + ok(container == (IUnknown *)0xdeadbeef, "returned %p\n", container); + DestroyWindow(hwnd); + + hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IOleObject, (void **)&control); + ok(hr == S_OK, "Expected CoCreateInstance to return S_OK, got 0x%08x\n", hr); + + if (FAILED(hr)) + { + skip("Couldn't obtain a test IOleObject instance\n"); + return; + } + + hr = AtlAxAttachControl(control, NULL, NULL); + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + + container = NULL; + hr = AtlAxAttachControl(control, NULL, &container); + ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); + ok(container != NULL, "got %p\n", container); + IUnknown_Release(container); + + hwnd = create_container_window(); + SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); + hr = AtlAxAttachControl(control, hwnd, NULL); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + val = GetWindowLongW(hwnd, GWLP_USERDATA); + ok(val == 0xdeadbeef, "returned %08x\n", val); + DestroyWindow(hwnd); + + hwnd = create_container_window(); + SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); + container = NULL; + hr = AtlAxAttachControl(control, hwnd, &container); + ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); + ok(container != NULL, "Expected not NULL!\n"); + val = GetWindowLongW(hwnd, GWLP_USERDATA); + todo_wine ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); + DestroyWindow(hwnd); + + IUnknown_Release(control); +} + START_TEST(atl) { + if (!register_class()) + return; + CoInitialize(NULL); test_winmodule(); @@ -767,6 +864,7 @@ START_TEST(atl) test_cp(); test_source_iface(); test_ax_win(); + test_AtlAxAttachControl(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmband/tests: Remove an unused assigment (PVS-Studio).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 468cb274d145bfe6ba547a91af2e4bb3a4bf0c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=468cb274d145bfe6ba547a91a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:02:26 2015 +0100 dmband/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmband/tests/dmband.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index cfbf34d..e2ba8d8 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -126,7 +126,7 @@ static void test_COM_bandtrack(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Matteo Bruni : wined3d: Use the core glColorMaski function.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 7e169d43c546c0175868a2eeb114f4c8b996a9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e169d43c546c0175868a2eeb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 14 16:27:32 2015 +0100 wined3d: Use the core glColorMaski function. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 00d2ac6..7259dfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2883,6 +2883,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */ USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ + USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ @@ -2911,6 +2912,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glBlendFuncSeparate, glBlendFuncSeparateEXT); MAP_GL_FUNCTION(glBufferData, glBufferDataARB); MAP_GL_FUNCTION(glBufferSubData, glBufferSubDataARB); + MAP_GL_FUNCTION(glColorMaski, glColorMaskIndexedEXT); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 725ed63..a8e6e8a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1600,11 +1600,12 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DWORD mask) { - GL_EXTCALL(glColorMaskIndexedEXT(index, + GL_EXTCALL(glColorMaski(index, mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, mask & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE)); + checkGLcall("glColorMaski"); } static void state_colorwrite0(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Michael Stefaniuc : dmcompos/tests: Remove an unused assigment (PVS-Studio ).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 68e76e67f62fd51d63f8f307c577ee4d4c9966aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e76e67f62fd51d63f8f307c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:08:43 2015 +0100 dmcompos/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmcompos/tests/dmcompos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index aaaa4ac..16dc75e 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -218,7 +218,7 @@ static void test_COM_track(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Bruno Jesus : ws2_32: Trace getpeername() result.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 632de943bed4aa0072c0690dbe903eef8328240b URL: http://source.winehq.org/git/wine.git/?a=commit;h=632de943bed4aa0072c0690db… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 14 22:51:16 2015 -0200 ws2_32: Trace getpeername() result. --- dlls/ws2_32/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5b9a441..0bc9d16 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2985,7 +2985,10 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) /* The buffer was too small */ SetLastError(WSAEFAULT); else + { res = 0; + TRACE("=> %s\n", debugstr_sockaddr(name)); + } } else SetLastError(wsaErrno());

1 0

Qian Hong : atl: Don't conflict GWLP_USERDATA with user applications.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 6756049be4b97de448f4bcbee8757db2cfda5c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6756049be4b97de448f4bcbee… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jan 15 17:28:50 2015 +0800 atl: Don't conflict GWLP_USERDATA with user applications. --- dlls/atl/atl_ax.c | 12 +++++++----- dlls/atl100/tests/atl.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index d7cf074..d16cdfd 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -55,6 +55,8 @@ typedef struct IOCS { BOOL fActive, fInPlace, fWindowless; } IOCS; +static const WCHAR wine_atl_iocsW[] = {'_','_','W','I','N','E','_','A','T','L','_','I','O','C','S','\0'}; + /********************************************************************** * AtlAxWin class window procedure */ @@ -150,7 +152,7 @@ static HRESULT IOCS_Detach( IOCS *This ) /* remove subclassing */ if ( This->hWnd ) { SetWindowLongPtrW( This->hWnd, GWLP_WNDPROC, (ULONG_PTR) This->OrigWndProc ); - SetWindowLongPtrW( This->hWnd, GWLP_USERDATA, 0 ); + RemovePropW( This->hWnd, wine_atl_iocsW); This->hWnd = NULL; } if ( This->control ) @@ -906,7 +908,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { - IOCS *This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + IOCS *This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); return IOCS_OnWndProc( This, hWnd, wMsg, wParam, lParam ); } @@ -915,7 +917,7 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su This->hWnd = hWnd; IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IOleObject_SetClientSite( This->control, &This->IOleClientSite_iface ); - SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This ); + SetPropW( hWnd, wine_atl_iocsW, This ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); return S_OK; @@ -1328,7 +1330,7 @@ HRESULT WINAPI AtlAxGetHost(HWND hWnd, IUnknown **host) *host = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); if ( !This ) { WARN("No container attached to %p\n", hWnd ); @@ -1350,7 +1352,7 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) *pUnk = NULL; - This = (IOCS*) GetWindowLongPtrW( hWnd, GWLP_USERDATA ); + This = (IOCS*) GetPropW( hWnd, wine_atl_iocsW ); if ( !This || !This->control ) { WARN("No control attached to %p\n", hWnd ); diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 6a8bbce..8cf0a32 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -845,7 +845,7 @@ static void test_AtlAxAttachControl(void) ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); ok(container != NULL, "Expected not NULL!\n"); val = GetWindowLongW(hwnd, GWLP_USERDATA); - todo_wine ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); + ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); DestroyWindow(hwnd); IUnknown_Release(control);

1 0

Qian Hong : ntdll: Fixed buffer size checking for ProcessWow64Information on 64bit in NtQueryInformationProcess.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: d45bda3014cbf21e8fa8e8e429531aed4eeb530e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45bda3014cbf21e8fa8e8e42… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jan 15 16:52:26 2015 +0800 ntdll: Fixed buffer size checking for ProcessWow64Information on 64bit in NtQueryInformationProcess. --- dlls/ntdll/process.c | 12 +++++--- dlls/ntdll/tests/info.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 633a668..3defb6e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -403,10 +403,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( break; case ProcessWow64Information: - len = sizeof(DWORD); - if (ProcessInformationLength == len) + len = sizeof(ULONG_PTR); + if (ProcessInformationLength != len) ret = STATUS_INFO_LENGTH_MISMATCH; + else if (!ProcessInformation) ret = STATUS_ACCESS_VIOLATION; + else if(!ProcessHandle) ret = STATUS_INVALID_HANDLE; + else { - DWORD val = 0; + ULONG_PTR val = 0; if (ProcessHandle == GetCurrentProcess()) val = is_wow64; else if (server_cpus & (1 << CPU_x86_64)) @@ -418,9 +421,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( } SERVER_END_REQ; } - *(DWORD *)ProcessInformation = val; + *(ULONG_PTR *)ProcessInformation = val; } - else ret = STATUS_INFO_LENGTH_MISMATCH; break; case ProcessImageFileName: /* FIXME: this will return a DOS path. Windows returns an NT path. Changing this would require also changing kernel32.QueryFullProcessImageName. diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index af00401..5fff490 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -737,6 +737,84 @@ static void test_query_processor_power_info(void) HeapFree(GetProcessHeap(), 0, ppi); } +static void test_query_process_wow64(void) +{ + NTSTATUS status; + ULONG ReturnLength; + ULONG_PTR pbi[2], dummy; + + memset(&dummy, 0xcc, sizeof(dummy)); + + /* Do not give a handle and buffer */ + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + /* Use a correct info class and buffer size, but still no handle and buffer */ + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_HANDLE, got %08x\n", status); + + /* Use a correct info class, buffer size and handle, but no buffer */ + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, NULL, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_ACCESS_VIOLATION , "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + + /* Use a correct info class, buffer and buffer size, but no handle */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + + /* Use a greater buffer size */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(NULL, ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + + /* Use no ReturnLength */ + pbi[0] = pbi[1] = dummy; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), NULL); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + trace( "Platform is_wow64 %d, ProcessInformation of ProcessWow64Information %lx\n", is_wow64, pbi[0]); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); + ok( pbi[0] != dummy, "pbi[0] %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + /* Test written size on 64 bit by checking high 32 bit buffer */ + if (sizeof(ULONG_PTR) > sizeof(DWORD)) + { + DWORD *ptr = (DWORD *)pbi; + ok( ptr[1] != (DWORD)dummy, "ptr[1] unchanged!\n"); + } + + /* Finally some correct calls */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( is_wow64 == (pbi[0] != 0), "is_wow64 %x, pbi[0] %lx\n", is_wow64, pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + ok( ReturnLength == sizeof(ULONG_PTR), "Inconsistent length %d\n", ReturnLength); + + /* Everything is correct except a too small buffer size */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) - 1, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); + + /* Everything is correct except a too large buffer size */ + pbi[0] = pbi[1] = dummy; + ReturnLength = 0xdeadbeef; + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, pbi, sizeof(ULONG_PTR) + 1, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( pbi[0] == dummy, "pbi[0] changed to %lx\n", pbi[0]); + ok( pbi[1] == dummy, "pbi[1] changed to %lx\n", pbi[1]); + todo_wine ok( ReturnLength == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", ReturnLength); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -1714,6 +1792,10 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); + /* 0x1A ProcessWow64Information */ + trace("Starting test_query_process_wow64()\n"); + test_query_process_wow64(); + /* 0x1B ProcessImageFileName */ trace("Starting test_query_process_image_file_name()\n"); test_query_process_image_file_name();

1 0