wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Michael Stefaniuc : dmstyle/tests: Remove unused assigments (PVS-Studio).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 277b09059cd61e382c63df4bd9fb8b0a91d5407c URL: http://source.winehq.org/git/wine.git/?a=commit;h=277b09059cd61e382c63df4bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 13:05:04 2015 +0100 dmstyle/tests: Remove unused assigments (PVS-Studio). --- dlls/dmstyle/tests/dmstyle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index be9de42..1401d75 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -129,7 +129,7 @@ static void test_COM_section(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 = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); @@ -196,7 +196,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

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

15 Jan '15

Module: wine Branch: master Commit: d84659cad75be0ea169171cdc86b2d9625268aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84659cad75be0ea169171cdc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 13:01:08 2015 +0100 dmscript/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmscript/tests/dmscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 02fddc3..59858d5 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -164,7 +164,7 @@ static void test_COM_scripttrack(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(dmt, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

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

15 Jan '15

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

Michael Stefaniuc : dmloader/tests: Test the return of CoCreateInstance ( PVS-Studio).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 9d52d8c07dc6e6b50c48e7120f951bcb38000ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d52d8c07dc6e6b50c48e7120… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:14:10 2015 +0100 dmloader/tests: Test the return of CoCreateInstance (PVS-Studio). --- dlls/dmloader/tests/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 46a2b93..3083ac5 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -47,6 +47,7 @@ static void test_release_object(void) IDirectMusicLoader8* loader = NULL; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %08x\n", hr); hr = IDirectMusicLoader_ReleaseObject(loader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr);

1 0

Michael Stefaniuc : dmime/tests: Remove unused assigments (PVS-Studio).
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 4ffcae35d294a0133a83168641b0154e8034a2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffcae35d294a0133a8316864… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 12:09:15 2015 +0100 dmime/tests: Remove unused assigments (PVS-Studio). --- dlls/dmime/tests/dmime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 03b0a37..f7c018f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -133,7 +133,7 @@ static void test_COM_audiopathconfig(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 = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); @@ -358,7 +358,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

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

15 Jan '15

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

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

15 Jan '15

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 15 Jan '15

15 Jan '15

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

Matteo Bruni : wined3d: Use the core version of the gl*Buffer* functions.
by Alexandre Julliard 15 Jan '15

15 Jan '15

Module: wine Branch: master Commit: 79a0dece8b2a27979835076914a21f468515d8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a0dece8b2a2797983507691… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 14 16:27:31 2015 +0100 wined3d: Use the core version of the gl*Buffer* functions. --- dlls/wined3d/buffer.c | 56 ++++++++++++++++---------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 26 ++++++++++++--- dlls/wined3d/state.c | 32 +++++++++---------- dlls/wined3d/surface.c | 86 +++++++++++++++++++++++++------------------------- dlls/wined3d/volume.c | 42 ++++++++++++------------ 6 files changed, 130 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79a0dece8b2a279798350…

1 0

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

15 Jan '15

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

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2015