Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70302: [PSDK] Update d3dtypes.h. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 12:38:18 2015 New Revision: 70302 URL: http://svn.reactos.org/svn/reactos?rev=70302&view=rev Log: [PSDK] Update d3dtypes.h. CORE-10536 Modified: trunk/reactos/include/psdk/d3dtypes.h Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] Tue Dec 8 12:38:18 2015 @@ -34,6 +34,10 @@ #include <float.h> #include <ddraw.h> +#ifdef __i386__ +#include <pshpack4.h> +#endif + #define D3DVALP(val, prec) ((float)(val)) #define D3DVAL(val) ((float)(val)) #define D3DDivide(a, b) (float)((double) (a) / (double) (b)) @@ -57,10 +61,10 @@ #define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) #define D3DRGB(r, g, b) \ - (0xff000000L | ( ((long)((r) * 255)) << 16) | (((long)((g) * 255)) << 8) | (long)((b) * 255)) + (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255)) #define D3DRGBA(r, g, b, a) \ - ( (((long)((a) * 255)) << 24) | (((long)((r) * 255)) << 16) \ - | (((long)((g) * 255)) << 8) | (long)((b) * 255) \ + ( (((LONG)((a) * 255)) << 24) | (((LONG)((r) * 255)) << 16) \ + | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255) \ ) #define RGB_GETRED(rgb) (((rgb) >> 16) & 0xff) @@ -76,9 +80,9 @@ #define D3DENUMRET_CANCEL DDENUMRET_CANCEL #define D3DENUMRET_OK DDENUMRET_OK -typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); -typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); -typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); +typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(void *ctx, DWORD offset); +typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(DDSURFACEDESC *surface_desc, void *ctx); +typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(DDPIXELFORMAT *format, void *ctx); #ifndef DX_SHARED_DEFINES @@ -344,9 +348,9 @@ /* This is different from MS, but avoids anonymous structs. */ D3DVALUE &operator () (int r, int c) - { return ((D3DVALUE [4][4])&_11)[r][c]; } + { return (&_11)[r*4 + c]; } const D3DVALUE &operator() (int r, int c) const - { return ((const D3DVALUE [4][4])&_11)[r][c]; } + { return (&_11)[r*4 + c]; } #endif } D3DMATRIX, *LPD3DMATRIX; #endif @@ -480,11 +484,11 @@ typedef struct _D3DTRANSFORMDATA { DWORD dwSize; - LPVOID lpIn; + void *lpIn; DWORD dwInSize; - LPVOID lpOut; + void *lpOut; DWORD dwOutSize; - LPD3DHVERTEX lpHOut; + D3DHVERTEX *lpHOut; DWORD dwClip; DWORD dwClipIntersection; DWORD dwClipUnion; @@ -613,9 +617,9 @@ typedef struct _D3DLIGHTDATA { DWORD dwSize; - LPD3DLIGHTINGELEMENT lpIn; + D3DLIGHTINGELEMENT *lpIn; DWORD dwInSize; - LPD3DTLVERTEX lpOut; + D3DTLVERTEX *lpOut; DWORD dwOutSize; } D3DLIGHTDATA, *LPD3DLIGHTDATA; @@ -1327,9 +1331,10 @@ #define D3DFVF_TLVERTEX ( D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | \ D3DFVF_TEX1 ) -typedef struct _D3DDP_PTRSTRIDE { - LPVOID lpvData; - DWORD dwStride; +typedef struct _D3DDP_PTRSTRIDE +{ + void *lpvData; + DWORD dwStride; } D3DDP_PTRSTRIDE; #define D3DDP_MAXTEXCOORD 8 @@ -1415,6 +1420,10 @@ #define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* (DIRECT3D_VERSION < 0x0800) */ #endif

1 0

[akhaldi] 70301: [WINSPOOL_WINETEST] Import from Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 12:35:27 2015 New Revision: 70301 URL: http://svn.reactos.org/svn/reactos?rev=70301&view=rev Log: [WINSPOOL_WINETEST] Import from Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/winspool/CMakeLists.txt (with props) trunk/rostests/winetests/winspool/info.c (with props) trunk/rostests/winetests/winspool/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winspool/CMakeL… Added: trunk/rostests/winetests/winspool/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winspool/info.c… Added: trunk/rostests/winetests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winspool/testli…

1 0

[akhaldi] 70300: [QEDIT_WINETEST] Import from Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 11:26:07 2015 New Revision: 70300 URL: http://svn.reactos.org/svn/reactos?rev=70300&view=rev Log: [QEDIT_WINETEST] Import from Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/qedit/ trunk/rostests/winetests/qedit/CMakeLists.txt (with props) trunk/rostests/winetests/qedit/mediadet.c (with props) trunk/rostests/winetests/qedit/qedit.rc (with props) trunk/rostests/winetests/qedit/rc.h (with props) trunk/rostests/winetests/qedit/test.avi (with props) trunk/rostests/winetests/qedit/test_sound.avi (with props) trunk/rostests/winetests/qedit/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -72,6 +72,7 @@ add_subdirectory(pdh) add_subdirectory(propsys) add_subdirectory(psapi) +add_subdirectory(qedit) add_subdirectory(qmgr) add_subdirectory(quartz) add_subdirectory(rasapi32) Added: trunk/rostests/winetests/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/CMakeList… ============================================================================== --- trunk/rostests/winetests/qedit/CMakeLists.txt (added) +++ trunk/rostests/winetests/qedit/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,5 @@ + +add_executable(qedit_winetest mediadet.c testlist.c qedit.rc) +set_module_type(qedit_winetest win32cui) +add_importlibs(qedit_winetest oleaut32 ole32 msvcrt kernel32) +add_cd_file(TARGET qedit_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/qedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/mediadet.… ============================================================================== --- trunk/rostests/winetests/qedit/mediadet.c (added) +++ trunk/rostests/winetests/qedit/mediadet.c [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,478 @@ +/* + * Unit tests for Media Detector + * + * Copyright (C) 2008 Google (Lei Zhang, Dan Hipschman) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include "initguid.h" +#include "ole2.h" +#include "vfwmsgs.h" +#include "uuids.h" +#include "wine/test.h" +#include "qedit.h" +#include "control.h" +#include "rc.h" + +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + + +static WCHAR test_avi_filename[MAX_PATH]; +static WCHAR test_sound_avi_filename[MAX_PATH]; + +static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) +{ + static WCHAR temp_path[MAX_PATH]; + static const WCHAR prefix[] = {'D','E','S',0}; + static const WCHAR avi[] = {'a','v','i',0}; + HRSRC res; + HGLOBAL data; + char *mem; + DWORD size, written; + HANDLE fh; + BOOL ret; + + res = FindResourceW(NULL, MAKEINTRESOURCEW(id), MAKEINTRESOURCEW(AVI_RES_TYPE)); + if (!res) + return FALSE; + + data = LoadResource(NULL, res); + if (!data) + return FALSE; + + mem = LockResource(data); + if (!mem) + return FALSE; + + size = SizeofResource(NULL, res); + if (size == 0) + return FALSE; + + if (!GetTempPathW(MAX_PATH, temp_path)) + return FALSE; + + /* We might end up relying on the extension here, so .TMP is no good. */ + if (!GetTempFileNameW(temp_path, prefix, 0, name)) + return FALSE; + + DeleteFileW(name); + lstrcpyW(name + lstrlenW(name) - 3, avi); + + fh = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(fh, mem, size, &written, NULL); + CloseHandle(fh); + return ret && written == size; +} + +static BOOL init_tests(void) +{ + return unpack_avi_file(TEST_AVI_RES, test_avi_filename) + && unpack_avi_file(TEST_SOUND_AVI_RES, test_sound_avi_filename); +} + +static void test_mediadet(void) +{ + HRESULT hr; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + IMediaDet *pM = NULL; + ULONG refcount; + BSTR filename = NULL; + LONG nstrms = 0; + LONG strm; + AM_MEDIA_TYPE mt; + double fps; + int flags; + int i; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_MediaDet, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IMediaDet, (void**)&pM); + ok(hr == S_OK, "QueryInterface for IID_IMediaDet failed: %08x\n", hr); + refcount = IMediaDet_AddRef(pM); + ok(refcount == unk_obj.ref, "MediaDet just pretends to support COM aggregation\n"); + refcount = IMediaDet_Release(pM); + ok(refcount == unk_obj.ref, "MediaDet just pretends to support COM aggregation\n"); + refcount = IMediaDet_Release(pM); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); + + /* test.avi has one video stream. */ + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (LPVOID*)&pM); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pM != NULL, "pM is NULL\n"); + + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + + filename = (BSTR) -1; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + + nstrms = -1; + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + ok(hr == E_INVALIDARG, "IMediaDet_get_OutputStreams failed: %08x\n", hr); + ok(nstrms == -1, "IMediaDet_get_OutputStreams: nstrms is %i\n", nstrms); + + strm = -1; + /* The stream defaults to 0, even without a file! */ + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_get_CurrentStream(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + + /* But put_CurrentStream doesn't. */ + hr = IMediaDet_put_CurrentStream(pM, 0); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_put_CurrentStream(pM, -1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == E_INVALIDARG, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + + hr = IMediaDet_get_StreamMediaType(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + + filename = SysAllocString(test_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); + SysFreeString(filename); + + strm = -1; + /* The stream defaults to 0. */ + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + CoTaskMemFree(mt.pbFormat); + + /* Even before get_OutputStreams. */ + hr = IMediaDet_put_CurrentStream(pM, 1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + ok(hr == S_OK, "IMediaDet_get_OutputStreams failed: %08x\n", hr); + ok(nstrms == 1, "IMediaDet_get_OutputStreams: nstrms is %i\n", nstrms); + + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(lstrcmpW(filename, test_avi_filename) == 0, + "IMediaDet_get_Filename\n"); + SysFreeString(filename); + + hr = IMediaDet_get_Filename(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_Filename failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_get_CurrentStream(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_put_CurrentStream(pM, -1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + hr = IMediaDet_put_CurrentStream(pM, 1); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + /* Try again. */ + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_put_CurrentStream(pM, 0); + ok(hr == S_OK, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 0, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Video), + "IMediaDet_get_StreamMediaType\n"); + CoTaskMemFree(mt.pbFormat); + + hr = IMediaDet_get_FrameRate(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); + + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == S_OK, "IMediaDet_get_FrameRate failed: %08x\n", hr); + ok(fps == 10.0, "IMediaDet_get_FrameRate: fps is %f\n", fps); + + hr = IMediaDet_Release(pM); + ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_avi_filename); + + /* test_sound.avi has one video stream and one audio stream. */ + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (LPVOID*)&pM); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pM != NULL, "pM is NULL\n"); + + filename = SysAllocString(test_sound_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); + SysFreeString(filename); + + hr = IMediaDet_get_OutputStreams(pM, &nstrms); + ok(hr == S_OK, "IMediaDet_get_OutputStreams failed: %08x\n", hr); + ok(nstrms == 2, "IMediaDet_get_OutputStreams: nstrms is %i\n", nstrms); + + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); + ok(lstrcmpW(filename, test_sound_avi_filename) == 0, + "IMediaDet_get_Filename\n"); + SysFreeString(filename); + + /* I don't know if the stream order is deterministic. Just check + for both an audio and video stream. */ + flags = 0; + + for (i = 0; i < 2; ++i) + { + hr = IMediaDet_put_CurrentStream(pM, i); + ok(hr == S_OK, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == i, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) + ? 1 + : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) + ? 2 + : 0)); + + if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) + { + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); + } + + CoTaskMemFree(mt.pbFormat); + } + ok(flags == 3, "IMediaDet_get_StreamMediaType: flags are %i\n", flags); + + hr = IMediaDet_put_CurrentStream(pM, 2); + ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); + ok(strm == 1, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + + hr = IMediaDet_Release(pM); + ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_sound_avi_filename); +} + +static void test_samplegrabber(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + ISampleGrabber *sg; + IBaseFilter *bf; + IMediaFilter *mf; + IPersist *persist; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_ISampleGrabber, (void**)&sg); + ok(hr == S_OK, "QueryInterface for IID_ISampleGrabber failed: %08x\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + IUnknown_Release(unk_obj.inner_unk); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&sg); + ok(hr == E_NOINTERFACE, "SampleGrabber create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all SampleGrabber interfaces */ + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_ISampleGrabber, + (void**)&sg); + ok(hr == S_OK, "SampleGrabber create failed: %08x, expected S_OK\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IBaseFilter, (void**)&bf); + ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr); + refcount = IBaseFilter_AddRef(bf); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IBaseFilter_Release(bf); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaFilter, (void**)&mf); + ok(hr == S_OK, "QueryInterface for IID_IMediaFilter failed: %08x\n", hr); + refcount = IMediaFilter_AddRef(mf); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IMediaFilter_Release(mf); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "QueryInterface for IID_IPersist failed: %08x\n", hr); + refcount = IPersist_AddRef(persist); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IPersist_Release(persist); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 7, "refcount == %u, expected 7\n", refcount); + refcount = IUnknown_Release(unk); + + /* Interfaces that native does not support */ + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaPosition, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaPosition failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaSeeking, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaSeeking failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IMemInputPin, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMemInputPin failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IQualityControl, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IQualityControl failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_ISeekingPassThru, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_ISeekingPassThru failed: %08x\n", hr); + + while (ISampleGrabber_Release(sg)); +} + +static void test_COM_sg_enumpins(void) +{ + IBaseFilter *bf; + IEnumPins *pins, *pins2; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, + (void**)&bf); + ok(hr == S_OK, "SampleGrabber create failed: %08x, expected S_OK\n", hr); + hr = IBaseFilter_EnumPins(bf, &pins); + ok(hr == S_OK, "EnumPins create failed: %08x, expected S_OK\n", hr); + + /* Same refcount for all EnumPins interfaces */ + refcount = IEnumPins_AddRef(pins); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IEnumPins_QueryInterface(pins, &IID_IEnumPins, (void**)&pins2); + ok(hr == S_OK, "QueryInterface for IID_IEnumPins failed: %08x\n", hr); + ok(pins == pins2, "QueryInterface for self failed (%p != %p)\n", pins, pins2); + IEnumPins_Release(pins2); + + hr = IEnumPins_QueryInterface(pins, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IEnumPins_Release(pins)); + IBaseFilter_Release(bf); +} + +START_TEST(mediadet) +{ + if (!init_tests()) + { + skip("Couldn't initialize tests!\n"); + return; + } + + CoInitialize(NULL); + test_mediadet(); + test_samplegrabber(); + test_COM_sg_enumpins(); + CoUninitialize(); +} Propchange: trunk/rostests/winetests/qedit/mediadet.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/qedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/qedit.rc?… ============================================================================== --- trunk/rostests/winetests/qedit/qedit.rc (added) +++ trunk/rostests/winetests/qedit/qedit.rc [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,26 @@ +/* + * Resource file for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "rc.h" + +/* @makedep: test.avi */ +TEST_AVI_RES AVI_RES_TYPE test.avi +/* @makedep: test_sound.avi */ +TEST_SOUND_AVI_RES AVI_RES_TYPE test_sound.avi Propchange: trunk/rostests/winetests/qedit/qedit.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/rc.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/rc.h?rev=… ============================================================================== --- trunk/rostests/winetests/qedit/rc.h (added) +++ trunk/rostests/winetests/qedit/rc.h [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,29 @@ +/* + * Resource identifiers for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef QEDIT_TESTS_RC_INCLUDED +#define QEDIT_TESTS_RC_INCLUDED + +#define TEST_AVI_RES 1 +#define TEST_SOUND_AVI_RES 2 + +#define AVI_RES_TYPE 256 + +#endif /* QEDIT_TESTS_RC_INCLUDED */ Propchange: trunk/rostests/winetests/qedit/rc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qedit/test.avi URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/test.avi?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/qedit/test.avi ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/winetests/qedit/test_sound.avi URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/test_soun… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/winetests/qedit/test_sound.avi ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/winetests/qedit/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/testlist.… ============================================================================== --- trunk/rostests/winetests/qedit/testlist.c (added) +++ trunk/rostests/winetests/qedit/testlist.c [iso-8859-1] Tue Dec 8 11:26:07 2015 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_mediadet(void); + +const struct test winetest_testlist[] = +{ + { "mediadet", func_mediadet }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/qedit/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 70299: [NETCFGX_WINETEST] Import from Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 11:18:34 2015 New Revision: 70299 URL: http://svn.reactos.org/svn/reactos?rev=70299&view=rev Log: [NETCFGX_WINETEST] Import from Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/netcfgx/ trunk/rostests/winetests/netcfgx/CMakeLists.txt (with props) trunk/rostests/winetests/netcfgx/netcfgx.c (with props) trunk/rostests/winetests/netcfgx/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -59,6 +59,7 @@ add_subdirectory(msvfw32) add_subdirectory(msxml3) add_subdirectory(netapi32) +add_subdirectory(netcfgx) add_subdirectory(ntdll) add_subdirectory(ntdsapi) add_subdirectory(ntprint) Added: trunk/rostests/winetests/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netcfgx/CMakeLi… ============================================================================== --- trunk/rostests/winetests/netcfgx/CMakeLists.txt (added) +++ trunk/rostests/winetests/netcfgx/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -0,0 +1,6 @@ + +add_executable(netcfgx_winetest netcfgx.c testlist.c) +target_link_libraries(netcfgx_winetest uuid) +set_module_type(netcfgx_winetest win32cui) +add_importlibs(netcfgx_winetest ole32 msvcrt kernel32) +add_cd_file(TARGET netcfgx_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/netcfgx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netcfgx/netcfgx… ============================================================================== --- trunk/rostests/winetests/netcfgx/netcfgx.c (added) +++ trunk/rostests/winetests/netcfgx/netcfgx.c [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -0,0 +1,95 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <wine/test.h> +#include <objbase.h> +#include <netcfgx.h> + +static void create_configuration(void) +{ + static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; + static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; + HRESULT hr; + INetCfg *config = NULL; + INetCfgLock *netlock = NULL; + INetCfgComponent *component = NULL; + LPWSTR client = NULL; + + hr = CoCreateInstance( &CLSID_CNetCfg, NULL, CLSCTX_ALL, &IID_INetCfg, (LPVOID*)&config); + ok(hr == S_OK, "Failed to create object\n"); + if(SUCCEEDED(hr)) + { + hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + ok(hr == S_OK || + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + if(hr == S_OK) + { + trace("Lock value: %s\n", wine_dbgstr_w(client)); + CoTaskMemFree(client); + } + else if(hr == E_ACCESSDENIED) + trace("Not run with Admin permissions\n"); + + hr = INetCfg_Initialize(config, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* AcquireWriteLock needs to be run before Initialize */ + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + + hr = INetCfg_FindComponent(config, tcpipW, &component); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + { + INetCfgComponent_Release(component); + } + + hr = INetCfg_Apply(config); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + + hr = INetCfg_Uninitialize(config); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetCfgLock_ReleaseWriteLock(netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + + INetCfgLock_Release(netlock); + INetCfg_Release(config); + } +} + +START_TEST(netcfgx) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_configuration(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/netcfgx/netcfgx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/netcfgx/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netcfgx/testlis… ============================================================================== --- trunk/rostests/winetests/netcfgx/testlist.c (added) +++ trunk/rostests/winetests/netcfgx/testlist.c [iso-8859-1] Tue Dec 8 11:18:34 2015 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_netcfgx(void); + +const struct test winetest_testlist[] = +{ + { "netcfgx", func_netcfgx }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/netcfgx/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 70298: [PSDK] Update stdole2.idl. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 11:15:23 2015 New Revision: 70298 URL: http://svn.reactos.org/svn/reactos?rev=70298&view=rev Log: [PSDK] Update stdole2.idl. CORE-10536 Modified: trunk/reactos/include/psdk/stdole2.idl Modified: trunk/reactos/include/psdk/stdole2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stdole2.idl?r… ============================================================================== --- trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] Tue Dec 8 11:15:23 2015 @@ -18,6 +18,13 @@ * */ +#if 0 +#pragma makedep install +#pragma makedep typelib +#endif + +#include <olectl.h> + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), @@ -61,7 +68,7 @@ void *pfnDeferredFillIn; SCODE scode; } EXCEPINFO; -#ifndef __midl + [ odl, uuid(00000000-0000-0000-C000-000000000046), @@ -139,7 +146,7 @@ HRESULT Clone( [out] IEnumVARIANT **ppenum); } -#endif /* !__midl */ + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] unsigned long OLE_COLOR; @@ -270,14 +277,14 @@ ] dispinterface Font { properties: - [id(0x0)] BSTR Name; - [id(0x2)] CURRENCY Size; - [id(0x3)] VARIANT_BOOL Bold; - [id(0x4)] VARIANT_BOOL Italic; - [id(0x5)] VARIANT_BOOL Underline; - [id(0x6)] VARIANT_BOOL Strikethrough; - [id(0x7)] short Weight; - [id(0x8)] short Charset; + [id(DISPID_FONT_NAME)] BSTR Name; + [id(DISPID_FONT_SIZE)] CURRENCY Size; + [id(DISPID_FONT_BOLD)] VARIANT_BOOL Bold; + [id(DISPID_FONT_ITALIC)] VARIANT_BOOL Italic; + [id(DISPID_FONT_UNDER)] VARIANT_BOOL Underline; + [id(DISPID_FONT_STRIKE)] VARIANT_BOOL Strikethrough; + [id(DISPID_FONT_WEIGHT)] short Weight; + [id(DISPID_FONT_CHARSET)] short Charset; methods: } @@ -349,13 +356,14 @@ ] dispinterface Picture { properties: - [id(0x0), readonly] OLE_HANDLE Handle; - [id(0x2)] OLE_HANDLE hPal; - [id(0x3), readonly] short Type; - [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; - [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height; + [id(DISPID_PICT_HANDLE), readonly] OLE_HANDLE Handle; + [id(DISPID_PICT_HPAL)] OLE_HANDLE hPal; + [id(DISPID_PICT_TYPE), readonly] short Type; + [id(DISPID_PICT_WIDTH), readonly] OLE_XSIZE_HIMETRIC Width; + [id(DISPID_PICT_HEIGHT), readonly] OLE_YSIZE_HIMETRIC Height; methods: - [id(0x6)] void Render(int hdc, + [id(DISPID_PICT_RENDER)] + void Render(int hdc, long x, long y, long cx, @@ -400,9 +408,9 @@ helpcontext(0x2775) ] HRESULT LoadPicture([in, optional] VARIANT filename, - [in, optional, defaultvalue(0)] int widthDesired, - [in, optional, defaultvalue(0)] int heightDesired, - [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [in, defaultvalue(0)] int widthDesired, + [in, defaultvalue(0)] int heightDesired, + [in, defaultvalue(Default)] enum LoadPictureConstants flags, [out, retval] IPictureDisp **retval); [ entry("OleSavePictureFile"), @@ -422,7 +430,7 @@ dispinterface FontEvents { properties: methods: - [id(0x9)] void FontChanged([in] BSTR PropertyName); + [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName); }; typedef [public] FontEvents IFontEventsDisp;

1 0

[akhaldi] 70297: [NETAPI32_WINETEST] Remove a meaningless line.
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 11:06:25 2015 New Revision: 70297 URL: http://svn.reactos.org/svn/reactos?rev=70297&view=rev Log: [NETAPI32_WINETEST] Remove a meaningless line. Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Tue Dec 8 11:06:25 2015 @@ -7,7 +7,6 @@ testlist.c) add_executable(netapi32_winetest ${SOURCE}) -target_link_libraries(netapi32_winetest) set_module_type(netapi32_winetest win32cui) add_importlibs(netapi32_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 70296: [BROWSEUI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 10:49:38 2015 New Revision: 70296 URL: http://svn.reactos.org/svn/reactos?rev=70296&view=rev Log: [BROWSEUI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Tue Dec 8 10:49:38 2015 @@ -368,9 +368,37 @@ CoTaskMemFree(acl2); } +static void test_ACListISF(void) +{ + IEnumString *enumstring; + IACList *list, *list2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ACListISF, NULL, CLSCTX_INPROC, &IID_IACList, (void**)&list); + ok(hr == S_OK, "failed to create ACListISF instance, 0x%08x\n", hr); + + hr = IACList_QueryInterface(list, &IID_IEnumString, (void**)&enumstring); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumString_QueryInterface(enumstring, &IID_IACList, (void**)&list2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(list == list2, "got %p, %p\n", list, list2); + IACList_Release(list2); + + IEnumString_Release(enumstring); + IACList_Release(list); +} + START_TEST(autocomplete) { CoInitialize(NULL); + test_ACLMulti(); + + if (!winetest_interactive) + skip("ROSTESTS-210: Skipping test_ACListISF().\n"); + else + test_ACListISF(); + CoUninitialize(); }

1 0

[akhaldi] 70295: [SHELL32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 10:33:14 2015 New Revision: 70295 URL: http://svn.reactos.org/svn/reactos?rev=70295&view=rev Log: [SHELL32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/assoc.c trunk/rostests/winetests/shell32/ebrowser.c trunk/rostests/winetests/shell32/progman_dde.c trunk/rostests/winetests/shell32/shelldispatch.c trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellole.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/string.c trunk/rostests/winetests/shell32/systray.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… Modified: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… Modified: trunk/rostests/winetests/shell32/ebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/ebrowse… Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellol… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/string.… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray…

1 0

[akhaldi] 70294: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 10:24:11 2015 New Revision: 70294 URL: http://svn.reactos.org/svn/reactos?rev=70294&view=rev Log: [MMDEVAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/mmdevapi/capture.c trunk/rostests/winetests/mmdevapi/render.c Modified: trunk/rostests/winetests/mmdevapi/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/captur… ============================================================================== --- trunk/rostests/winetests/mmdevapi/capture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/capture.c [iso-8859-1] Tue Dec 8 10:24:11 2015 @@ -38,6 +38,9 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDevice *dev = NULL; static const LARGE_INTEGER ullZero; @@ -83,7 +86,7 @@ HRESULT hr; UINT32 frames, next, pad, sum = 0; BYTE *data; - DWORD flags, r; + DWORD flags; UINT64 pos, qpc; REFERENCE_TIME period; @@ -241,7 +244,11 @@ ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + if(qpc2 != qpc) + /* FIXME: Some drivers fail */ + todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + else + ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } /* trace after the GCP test because log output to MS-DOS console disturbs timing */ @@ -304,14 +311,23 @@ if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + /* FIXME: Some drivers fail */ + todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + todo_wine ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + }else{ + ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + + /* Native's position is one period further than what we read. + * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: + * signal when the position jump left a gap. */ + ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + } + ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - /* Native's position is one period further than what we read. - * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: - * signal when the position jump left a gap. */ - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) sum = pos; } @@ -416,32 +432,6 @@ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); IAudioCaptureClient_ReleaseBuffer(acc, frames); } - - hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - /* Still receiving events! */ - r = WaitForSingleObject(handle, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); - - hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); - - ok(ResetEvent(handle), "ResetEvent\n"); - - r = WaitForSingleObject(handle, 120); - ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); - - hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); - - r = WaitForSingleObject(handle, 70); - ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); - - hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); IAudioCaptureClient_Release(acc); } @@ -593,7 +583,8 @@ ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start before SetEventHandle returns %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); @@ -847,7 +838,6 @@ hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Master volume wasn't 1: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); Modified: trunk/rostests/winetests/mmdevapi/render.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/render… ============================================================================== --- trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/render.c [iso-8859-1] Tue Dec 8 10:24:11 2015 @@ -54,9 +54,13 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +/* undocumented error code */ +#define D3D11_ERROR_4E MAKE_HRESULT(SEVERITY_ERROR, FACILITY_DIRECT3D11, 0x4e) + static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ +static BOOL win10 = FALSE; static const LARGE_INTEGER ullZero; @@ -281,7 +285,8 @@ fmtex->dwChannelMask = 0xffff; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + ok(hr == S_OK || + hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); IAudioClient_Release(ac); @@ -330,9 +335,13 @@ ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), - "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* (!) win10 */, + "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", + (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); /* Native appears to add the engine period to the HW latency in shared mode */ + if(t2 == 0) + win10 = TRUE; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -467,169 +476,6 @@ } } -static void test_formats2(void) -{ - IAudioClient *ac; - HRESULT hr; - WAVEFORMATEX *pwfx, *pwfx2; - WAVEFORMATEXTENSIBLE *pwfe, wfe, *pwfe2; - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&ac); - - ok(hr == S_OK, "Activation failed with %08x\n", hr); - if (hr != S_OK) - return; - - hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); - if (hr != S_OK) - return; - - ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Invalid wFormatTag\n"); - if (pwfx->wFormatTag != WAVE_FORMAT_EXTENSIBLE) { - CoTaskMemFree(pwfx); - return; - } - - pwfe = (WAVEFORMATEXTENSIBLE*)pwfx; - ok(pwfe->Samples.wValidBitsPerSample, "wValidBitsPerSample should be non-zero\n"); - - if (pwfx->nChannels > 2) { - trace("Limiting channels to 2\n"); - pwfx->nChannels = 2; - pwfx->nBlockAlign = pwfx->wBitsPerSample / 8 * pwfx->nChannels; - pwfx->nAvgBytesPerSec = pwfx->nBlockAlign * pwfx->nSamplesPerSec; - pwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; - } - - wfe = *pwfe; - pwfx->nAvgBytesPerSec = pwfx->nBlockAlign = 0; - - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with nAvgBytesPerSec=0 and nBlockAlign=0 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == E_INVALIDARG || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with nAvgBytesPerSec=0 and nBlockAlign=0 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - pwfx->wFormatTag = WAVE_FORMAT_PCM; - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with nAvgBytesPerSec=0 and nBlockAlign=0 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfe->dwChannelMask = 0; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=0 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, - "Shared IsFormatSupported with dwChannelMask=0 returned %08x\n", hr); - CoTaskMemFree(pwfx2); - - - pwfe->dwChannelMask = 0x3ffff; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=0x3ffff returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK && !pwfx2, - "Shared IsFormatSupported with dwChannelMask=0x3ffff returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - - pwfe->dwChannelMask = 0x40000000; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=0x40000000 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK && !pwfx2, - "Shared IsFormatSupported with dwChannelMask=0x40000000 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - pwfe->dwChannelMask = SPEAKER_ALL | SPEAKER_RESERVED; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with dwChannelMask=SPEAKER_ALL | SPEAKER_RESERVED returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK && !pwfx2, - "Shared IsFormatSupported with dwChannelMask=SPEAKER_ALL | SPEAKER_RESERVED returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfe->Samples.wValidBitsPerSample = 0; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "Exclusive IsFormatSupported with wValidBitsPerSample=0 returned %08x\n", hr); - - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && pwfx2, - "Shared IsFormatSupported with wValidBitsPerSample=0 returned %08x %p\n", hr, pwfx2); - if (pwfx2) { - pwfe2 = (WAVEFORMATEXTENSIBLE*)pwfx2; - ok(pwfe2->Samples.wValidBitsPerSample == pwfx->wBitsPerSample, - "Shared IsFormatSupported had wValidBitsPerSample set to %u, not %u\n", - pwfe2->Samples.wValidBitsPerSample, pwfx->wBitsPerSample); - CoTaskMemFree(pwfx2); - } - - pwfx2 = NULL; - pwfe->Samples.wValidBitsPerSample = pwfx->wBitsPerSample + 1; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == E_INVALIDARG || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with wValidBitsPerSample += 1 returned %08x %p\n", hr, pwfx2); - - *pwfe = wfe; - memset(&pwfe->SubFormat, 0xff, 16); - pwfx2 = NULL; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !pwfx2, - "Shared IsFormatSupported with SubFormat=-1 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfx2 = NULL; - pwfe->Samples.wValidBitsPerSample = pwfx->wBitsPerSample = 256; - pwfx->nBlockAlign = pwfx->wBitsPerSample / 8 * pwfx->nChannels; - pwfx->nAvgBytesPerSec = pwfx->nBlockAlign * pwfx->nSamplesPerSec; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok((hr == E_INVALIDARG || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !pwfx2, - "Shared IsFormatSupported with wBitsPerSample=256 returned %08x %p\n", hr, pwfx2); - CoTaskMemFree(pwfx2); - - *pwfe = wfe; - pwfx2 = NULL; - pwfe->Samples.wValidBitsPerSample = pwfx->wBitsPerSample - 1; - hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_FALSE && pwfx2, - "Shared IsFormatSupported with wValidBitsPerSample-=1 returned %08x %p\n", hr, pwfx2); - if (pwfx2) { - pwfe2 = (WAVEFORMATEXTENSIBLE*)pwfx2; - ok(pwfe2->Samples.wValidBitsPerSample == pwfx->wBitsPerSample, - "Shared IsFormatSupported had wValidBitsPerSample set to %u, not %u\n", - pwfe2->Samples.wValidBitsPerSample, pwfx->wBitsPerSample); - CoTaskMemFree(pwfx2); - } - - CoTaskMemFree(pwfx); - IAudioClient_Release(ac); -} - static void test_references(void) { IAudioClient *ac; @@ -790,13 +636,15 @@ ok(event != NULL, "CreateEvent failed\n"); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start failed: %08x\n", hr); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || + hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || + hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08x\n", hr); r = WaitForSingleObject(event, 40); ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); @@ -896,10 +744,13 @@ hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); ok(buf != NULL, "NULL buffer returned\n"); - for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ - if(buf[i] != silence){ - ok(0, "buffer has data in it already\n"); - break; + if(!win10){ + /* win10 appears not to clear the buffer */ + for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ + if(buf[i] != silence){ + ok(0, "buffer has data in it already, i: %u, valu: %f\n", i, *((float*)buf)); + break; + } } } @@ -1073,7 +924,8 @@ hr = IAudioClient_GetStreamLatency(ac, &t2); ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000), + ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000) || + broken(t2 == 0) /* win10 */, "Latency < default period, delta %ldus\n", (long)((t2-period)/10)); /** GetBufferSize @@ -2135,7 +1987,6 @@ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); IAudioSessionManager_Release(cap_sesm); @@ -2164,7 +2015,6 @@ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); - ok(vol == 1.f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(cap_sav); } @@ -2418,7 +2268,6 @@ test_audioclient(); test_formats(AUDCLNT_SHAREMODE_EXCLUSIVE); test_formats(AUDCLNT_SHAREMODE_SHARED); - test_formats2(); test_references(); test_marshal(); trace("Output to a MS-DOS console is particularly slow and disturbs timing.\n");

1 0

[akhaldi] 70293: [USER32_WINETEST] Sync with Wine Staging 1.7.55 except clipboard tests. CORE-10536
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 10:22:43 2015 New Revision: 70293 URL: http://svn.reactos.org/svn/reactos?rev=70293&view=rev Log: [USER32_WINETEST] Sync with Wine Staging 1.7.55 except clipboard tests. CORE-10536 Modified: trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/sysparams.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -308,21 +308,33 @@ static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL ret; - DWORD error; - switch (msg) { /* Destroy the cursor. */ case WM_USER+1: + { + HCURSOR cursor = (HCURSOR)lParam; + ICONINFO info; + BOOL ret; + DWORD error; + + memset(&info, 0, sizeof(info)); + ret = GetIconInfo(cursor, &info); + todo_wine ok(ret, "GetIconInfoEx failed with error %u\n", GetLastError()); + todo_wine ok(info.hbmColor != NULL, "info.hmbColor was not set\n"); + todo_wine ok(info.hbmMask != NULL, "info.hmbColor was not set\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + SetLastError(0xdeadbeef); - ret = DestroyCursor((HCURSOR) lParam); + ret = DestroyCursor(cursor); error = GetLastError(); ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); return TRUE; + } case WM_DESTROY: PostQuitMessage(0); return 0; Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -2508,9 +2508,10 @@ mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", - i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); + + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); if (mii.hSubMenu) { @@ -2672,9 +2673,9 @@ mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", - i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", + i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); ok(mii.fType == menu_data[i].type, "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); @@ -2778,9 +2779,10 @@ mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(ret, "GetMenuItemInfo(%u) failed\n", i); -if (0) - trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", - i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); + + if (winetest_debug > 1) + trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); ok(mii.fType == item[i].type, "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… ============================================================================== --- trunk/rostests/winetests/user32/monitor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/monitor.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -34,6 +34,7 @@ static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); +static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); static void init_function_pointers(void) { @@ -48,6 +49,7 @@ GET_PROC(ChangeDisplaySettingsExW) GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) + GET_PROC(GetDisplayConfigBufferSizes) GET_PROC(GetMonitorInfoA) GET_PROC(GetMonitorInfoW) GET_PROC(MonitorFromPoint) @@ -543,6 +545,58 @@ DestroyWindow(hwnd); } +static void test_display_config(void) +{ + UINT32 paths, modes; + LONG ret; + + if (!pGetDisplayConfigBufferSizes) + { + win_skip("GetDisplayConfigBufferSizes is not supported\n"); + return; + } + + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 100; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(paths == 100, "got %u\n", paths); + + modes = 100; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, &modes); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(modes == 100, "got %u\n", modes); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + /* Invalid flags, non-zero invalid flags validation is version (or driver?) dependent, + it's unreliable to use in tests. */ + ret = pGetDisplayConfigBufferSizes(0, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 100; + ret = pGetDisplayConfigBufferSizes(0, &paths, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(paths == 100, "got %u\n", paths); + + modes = 100; + ret = pGetDisplayConfigBufferSizes(0, NULL, &modes); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok(modes == 100, "got %u\n", modes); + + paths = modes = 100; + ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok(modes == 0 && paths == 0, "got %u, %u\n", modes, paths); +} + START_TEST(monitor) { init_function_pointers(); @@ -550,4 +604,5 @@ test_ChangeDisplaySettingsEx(); test_monitors(); test_work_area(); -} + test_display_config(); +} Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -64,6 +64,10 @@ #define ARCH "x86" #elif defined __x86_64__ #define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" #else #define ARCH "none" #endif @@ -793,6 +797,9 @@ { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -3206,7 +3213,7 @@ { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible MDI child window */ -static const struct message WmRestoreMDIchildInisibleSeq[] = { +static const struct message WmRestoreMDIchildInvisibleSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, @@ -3534,7 +3541,7 @@ ok_sequence(WmHideChildSeq, "ShowWindow(SW_HIDE):MDI child", FALSE); ShowWindow(mdi_child2, SW_RESTORE); - ok_sequence(WmRestoreMDIchildInisibleSeq, "ShowWindow(SW_RESTORE):invisible MDI child", FALSE); + ok_sequence(WmRestoreMDIchildInvisibleSeq, "ShowWindow(SW_RESTORE):invisible MDI child", FALSE); flush_sequence(); ok(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE, "MDI child should be visible\n"); @@ -5292,6 +5299,21 @@ { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { 0 } }; +static const struct message WmLButtonDownStaticSeq[] = +{ + { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { 0 } +}; static const struct message WmLButtonUpSeq[] = { { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, @@ -5302,12 +5324,48 @@ { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, { 0 } }; +static const struct message WmLButtonUpStaticSeq[] = +{ + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, + { 0 } +}; +static const struct message WmLButtonUpAutoSeq[] = +{ + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETCHECK, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|defwinproc, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, + { 0 } +}; +static const struct message WmLButtonUpBrokenSeq[] = +{ + { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, + { 0 } +}; static const struct message WmSetFontButtonSeq[] = { { WM_SETFONT, sent }, { WM_PAINT, sent }, { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|defwinproc|optional }, /* FIXME: Wine sends it twice for BS_OWNERDRAW */ + { 0 } +}; +static const struct message WmSetFontStaticSeq[] = +{ + { WM_SETFONT, sent }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; static const struct message WmSetStyleButtonSeq[] = @@ -5468,48 +5526,62 @@ { static const struct { - DWORD style; - DWORD dlg_code; - const struct message *setfocus; - const struct message *killfocus; - const struct message *setstyle; - const struct message *setstate; - const struct message *clearstate; - const struct message *setcheck; + DWORD style; + DWORD dlg_code; + const struct message *setfocus; + const struct message *killfocus; + const struct message *setstyle; + const struct message *setstate; + const struct message *clearstate; + const struct message *setcheck; + const struct message *lbuttondown; + const struct message *lbuttonup; + const struct message *setfont; } button[] = { - { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, - WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq }, - { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, - WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq }, - { BS_CHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_AUTOCHECKBOX, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_AUTO3STATE, DLGC_BUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_GROUPBOX, DLGC_STATIC, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq }, - { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, - WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq }, - { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, - WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, - WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq }, - { BS_OWNERDRAW, DLGC_BUTTON, - WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, - WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq }, + { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, + WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, + WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + { BS_CHECKBOX, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_AUTOCHECKBOX, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_3STATE, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_AUTO3STATE, DLGC_BUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + { BS_GROUPBOX, DLGC_STATIC, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, + WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, + WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, + WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, + NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq }, + { BS_OWNERDRAW, DLGC_BUTTON, + WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, + WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, }; unsigned int i; HWND hwnd, parent; @@ -5537,12 +5609,13 @@ { MSG msg; DWORD style, state; + char desc[64]; trace("button style %08x\n", button[i].style); hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_CHILD | BS_NOTIFY, 0, 0, 50, 14, parent, (HMENU)ID_BUTTON, 0, NULL); - ok(hwnd != 0, "Failed to create button window\n"); + ok(hwnd != 0, "Failed to create button window\n"); style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY); @@ -5552,28 +5625,28 @@ else ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); - dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); - ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); - - ShowWindow(hwnd, SW_SHOW); - UpdateWindow(hwnd); - SetFocus(0); - flush_events(); - SetFocus(0); - flush_sequence(); + dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); + ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); + + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + SetFocus(0); + flush_events(); + SetFocus(0); + flush_sequence(); log_all_parent_messages++; ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); - SetFocus(hwnd); + SetFocus(hwnd); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); - - SetFocus(0); + ok_sequence(button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); + + SetFocus(0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); + ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); @@ -5662,39 +5735,45 @@ log_all_parent_messages--; - DestroyWindow(hwnd); + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_POPUP | WS_VISIBLE, + 0, 0, 50, 14, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create button window\n"); + + SetForegroundWindow(hwnd); + flush_events(); + + SetActiveWindow(hwnd); + SetFocus(0); + flush_sequence(); + + if (button[i].lbuttondown) + { + SendMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); + sprintf(desc, "button[%i]: WM_LBUTTONDOWN on a button", i); + ok_sequence(button[i].lbuttondown, desc, FALSE); + } + + SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); + sprintf(desc, "button[%i]: WM_LBUTTONUP on a button", i); + ok_sequence(button[i].lbuttonup, desc, FALSE); + + flush_sequence(); + zfont = GetStockObject(SYSTEM_FONT); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); + UpdateWindow(hwnd); + sprintf(desc, "button[%i]: WM_SETFONT on a button", i); + ok_sequence(button[i].setfont, desc, FALSE); + + DestroyWindow(hwnd); } DestroyWindow(parent); - - hwnd = CreateWindowExA(0, "my_button_class", "test", BS_PUSHBUTTON | WS_POPUP | WS_VISIBLE, - 0, 0, 50, 14, 0, 0, 0, NULL); - ok(hwnd != 0, "Failed to create button window\n"); - - SetForegroundWindow(hwnd); - flush_events(); - - SetActiveWindow(hwnd); - SetFocus(0); - flush_sequence(); - - SendMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); - ok_sequence(WmLButtonDownSeq, "WM_LBUTTONDOWN on a button", FALSE); - - SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); - ok_sequence(WmLButtonUpSeq, "WM_LBUTTONUP on a button", FALSE); - - flush_sequence(); - zfont = GetStockObject(SYSTEM_FONT); - SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); - UpdateWindow(hwnd); - ok_sequence(WmSetFontButtonSeq, "WM_SETFONT on a button", FALSE); - - DestroyWindow(hwnd); } /****************** static message test *************************/ -static const struct message WmSetFontStaticSeq[] = +static const struct message WmSetFontStaticSeq2[] = { { WM_SETFONT, sent }, { WM_PAINT, sent|defwinproc|optional }, @@ -5754,7 +5833,7 @@ const struct message *setfont; } static_ctrl[] = { { SS_LEFT, DLGC_STATIC, - WmSetFontStaticSeq } + WmSetFontStaticSeq2 } }; unsigned int i; HWND hwnd; @@ -6570,6 +6649,20 @@ ok_sequence( WmEmptySeq, "WmChildPaintNc2", FALSE ); RedrawWindow( hparent, NULL, 0, RDW_ERASENOW ); ok_sequence( WmEmptySeq, "WmChildPaintNc3", FALSE ); + + /* WS_CLIPCHILDREN doesn't exclude children from update region */ + flush_sequence(); + RedrawWindow( hparent, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_NOCHILDREN ); + GetClientRect( hparent, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hparent, hrgn ); + flush_events(); + + RedrawWindow( hparent, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + GetClientRect( hparent, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hparent, hrgn ); + flush_events(); /* test RDW_INTERNALPAINT behavior */ @@ -8428,6 +8521,7 @@ start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); +todo_wine ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, @@ -8496,6 +8590,7 @@ start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); +todo_wine ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, "did not get expected count for minimum timeout (%d != ~%d).\n", @@ -9107,6 +9202,54 @@ "unexpected error %d\n", GetLastError()); } +static HWND hook_hwnd; +static HHOOK recursive_hook; +static int hook_depth, max_hook_depth; + +static LRESULT WINAPI rec_get_message_hook(int code, WPARAM w, LPARAM l) +{ + LRESULT res; + MSG msg; + BOOL b; + + hook_depth++; + if(hook_depth > max_hook_depth) + max_hook_depth = hook_depth; + + b = PeekMessageW(&msg, hook_hwnd, 0, 0, PM_NOREMOVE); + ok(b, "PeekMessage failed\n"); + + res = CallNextHookEx(recursive_hook, code, w, l); + + hook_depth--; + return res; +} + +static void test_recursive_hook(void) +{ + MSG msg; + BOOL b; + + hook_hwnd = CreateWindowA("Static", NULL, WS_POPUP, 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(hook_hwnd != NULL, "CreateWindow failed\n"); + + recursive_hook = SetWindowsHookExW(WH_GETMESSAGE, rec_get_message_hook, NULL, GetCurrentThreadId()); + ok(recursive_hook != NULL, "SetWindowsHookEx failed\n"); + + PostMessageW(hook_hwnd, WM_USER, 0, 0); + PostMessageW(hook_hwnd, WM_USER+1, 0, 0); + + hook_depth = 0; + GetMessageW(&msg, hook_hwnd, 0, 0); + ok(15 < max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); + trace("max_hook_depth = %d\n", max_hook_depth); + + b = UnhookWindowsHookEx(recursive_hook); + ok(b, "UnhokWindowsHookEx failed\n"); + + DestroyWindow(hook_hwnd); +} + static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, @@ -10336,13 +10479,14 @@ { MSG msg; DWORD time; - BOOL ret, go = FALSE; + BOOL ret; time = GetTickCount(); - while (GetTickCount() - time < 200 && !go) { + while (GetTickCount() - time < 200) { ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); - go = ret && msg.pt.x > x && msg.pt.y > y; + if (ret && msg.pt.x > x && msg.pt.y > y) break; if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, GetTickCount() - time, QS_ALLINPUT ); + else Sleep( GetTickCount() - time ); } } @@ -10517,6 +10661,25 @@ ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); ret = GetMessageA(&msg, NULL, 0, 0); ok(ret && msg.message == WM_USER + 1, "msg.message = %u instead of WM_USER + 1\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, 0); + ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); + + /* Newer messages are still returned when specifying a message range. */ + + SetTimer(hwnd, 1, 0, NULL); + while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); + ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + PostMessageA(hwnd, WM_USER + 1, 0, 0); + PostMessageA(hwnd, WM_USER, 0, 0); + ret = PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + todo_wine + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_USER + 1, "msg.message = %u instead of WM_USER + 1\n", msg.message); + ret = PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE); + ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message); ret = PeekMessageA(&msg, NULL, 0, 0, 0); ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); @@ -11955,6 +12118,18 @@ DestroyWindow(hwnd); } +static DWORD get_input_codepage( void ) +{ + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; +} + static void test_dbcs_wm_char(void) { BYTE dbch[2]; @@ -11968,6 +12143,7 @@ UINT i, j, k; struct message wmCharSeq[2]; BOOL ret; + DWORD cp = get_input_codepage(); if (!pGetCPInfoExA) { @@ -11975,7 +12151,7 @@ return; } - pGetCPInfoExA( CP_ACP, 0, &cpinfo ); + pGetCPInfoExA( cp, 0, &cpinfo ); if (cpinfo.MaxCharSize != 2) { skip( "Skipping DBCS WM_CHAR test in SBCS codepage '%s'\n", cpinfo.CodePageName ); @@ -11993,8 +12169,8 @@ WCHAR wstr[2]; str[0] = j; str[1] = k; - if (MultiByteToWideChar( CP_ACP, 0, str, 2, wstr, 2 ) == 1 && - WideCharToMultiByte( CP_ACP, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && + if (MultiByteToWideChar( cp, 0, str, 2, wstr, 2 ) == 1 && + WideCharToMultiByte( cp, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && (BYTE)str[0] == j && (BYTE)str[1] == k && HIBYTE(wstr[0]) && HIBYTE(wstr[0]) != 0xff) { @@ -14853,7 +15029,11 @@ test_timers(); test_timers_no_wnd(); test_timers_exceptions(); - if (hCBT_hook) test_set_hook(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout(); @@ -15107,7 +15287,11 @@ pUnhookWinEvent = 0; } hEvent_hook = 0; - if (hCBT_hook) test_set_hook(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } cleanup_tests(); } Modified: trunk/rostests/winetests/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/sysparam… ============================================================================== --- trunk/rostests/winetests/user32/sysparams.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/sysparams.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -2651,6 +2651,23 @@ ok( !( exp1 != act && exp2 != act && exp3 != act),"GetSystemMetrics(%s): expected %d or %d or %d actual %d\n", #i, exp1, exp2, exp3, act);\ } +static INT CALLBACK enum_all_fonts_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lparam) +{ + return lstrcmpiA(elf->lfFaceName, (const char *)lparam); +} + +static BOOL is_font_enumerated(const char *name) +{ + HDC hdc = CreateCompatibleDC(0); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)name)) + ret = TRUE; + + DeleteDC(hdc); + return ret; +} + static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; @@ -2692,6 +2709,13 @@ win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; } + + ok(is_font_enumerated(ncm.lfCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfCaptionFont.lfFaceName); + ok(is_font_enumerated(ncm.lfSmCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfSmCaptionFont.lfFaceName); + ok(is_font_enumerated(ncm.lfMenuFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMenuFont.lfFaceName); + ok(is_font_enumerated(ncm.lfStatusFont.lfFaceName), "font %s should be enumerated\n", ncm.lfStatusFont.lfFaceName); + ok(is_font_enumerated(ncm.lfMessageFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMessageFont.lfFaceName); + /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP) */ CaptionWidthfromreg = metricfromreg( Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Tue Dec 8 10:22:43 2015 @@ -57,6 +57,7 @@ static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); +static BOOL (WINAPI *pFlashWindow)( HWND hwnd, BOOL bInvert ); static BOOL (WINAPI *pFlashWindowEx)( PFLASHWINFO pfwi ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); @@ -68,6 +69,7 @@ static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; +static BOOL app_activated, app_deactivated; static const char* szAWRClass = "Winsize"; static HMENU hmenu; @@ -716,6 +718,13 @@ ok( !WaitForSingleObject( handle, 10000 ), "wait failed\n" ); CloseHandle( handle ); } + +static struct wm_gettext_override_data +{ + BOOL enabled; /* when 1 bypasses default procedure */ + char *buff; /* expected text buffer pointer */ + WCHAR *buffW; /* same, for W test */ +} g_wm_gettext_override; static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -798,9 +807,39 @@ break; case WM_GETTEXT: num_gettext_msgs++; + if (g_wm_gettext_override.enabled) + { + char *text = (char*)lparam; + ok(g_wm_gettext_override.buff == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buff, text); + ok(*text == 0, "expected empty string buffer %x\n", *text); + return 0; + } break; case WM_SETTEXT: num_settext_msgs++; + break; + case WM_ACTIVATEAPP: + if (wparam) app_activated = TRUE; + else app_deactivated = TRUE; + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_GETTEXT: + num_gettext_msgs++; + if (g_wm_gettext_override.enabled) + { + WCHAR *text = (WCHAR*)lparam; + ok(g_wm_gettext_override.buffW == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buffW, text); + ok(*text == 0, "expected empty string buffer %x\n", *text); + return 0; + } break; } @@ -832,8 +871,11 @@ return DefWindowProcA(hwnd, msg, wparam, lparam); } +static const WCHAR mainclassW[] = {'M','a','i','n','W','i','n','d','o','w','C','l','a','s','s','W',0}; + static BOOL RegisterWindowClasses(void) { + WNDCLASSW clsW; WNDCLASSA cls; cls.style = CS_DBLCLKS; @@ -848,6 +890,19 @@ cls.lpszClassName = "MainWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + + clsW.style = CS_DBLCLKS; + clsW.lpfnWndProc = main_window_procW; + clsW.cbClsExtra = 0; + clsW.cbWndExtra = 0; + clsW.hInstance = GetModuleHandleA(0); + clsW.hIcon = 0; + clsW.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + clsW.hbrBackground = GetStockObject(WHITE_BRUSH); + clsW.lpszMenuName = NULL; + clsW.lpszClassName = mainclassW; + + if(!RegisterClassW(&clsW)) return FALSE; cls.style = 0; cls.lpfnWndProc = tool_window_procA; @@ -1240,7 +1295,7 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) { MDICREATESTRUCTA mdi_cs; - HWND mdi_child; + HWND mdi_child, hwnd, exp_hwnd; INT_PTR id; static const WCHAR classW[] = {'M','D','I','_','c','h','i','l','d','_','C','l','a','s','s','_','1',0}; static const WCHAR titleW[] = {'M','D','I',' ','c','h','i','l','d',0}; @@ -1259,6 +1314,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1267,6 +1325,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1281,6 +1342,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1303,6 +1367,9 @@ { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1316,6 +1383,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1328,6 +1398,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1346,6 +1419,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1369,6 +1445,9 @@ { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1382,6 +1461,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1394,6 +1476,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1412,6 +1497,9 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1435,6 +1523,9 @@ { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1460,6 +1551,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); mdi_child = CreateWindowExA(0, "MDI_child_Class_2", "MDI child", @@ -1471,6 +1564,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); /* maximized child */ @@ -1483,6 +1578,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); trace("Creating maximized child with a caption\n"); @@ -1495,6 +1592,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); trace("Creating maximized child with a caption and a thick frame\n"); @@ -1507,6 +1606,8 @@ ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); } @@ -1819,51 +1920,7 @@ switch (msg) { case WM_CREATE: - { - CLIENTCREATESTRUCT client_cs; - RECT rc; - - GetClientRect(hwnd, &rc); - - client_cs.hWindowMenu = 0; - client_cs.idFirstChild = 1; - - /* MDIClient without MDIS_ALLCHILDSTYLES */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD /*| WS_VISIBLE*/, - /* tests depend on a not zero MDIClient size */ - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); - DestroyWindow(mdi_client); - - /* MDIClient with MDIS_ALLCHILDSTYLES */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD | MDIS_ALLCHILDSTYLES /*| WS_VISIBLE*/, - /* tests depend on a not zero MDIClient size */ - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); - DestroyWindow(mdi_client); - - /* Test child window stack management */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD, - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_child_stack(mdi_client); - DestroyWindow(mdi_client); - break; - } + return 1; case WM_WINDOWPOSCHANGED: { @@ -1943,7 +2000,9 @@ static void test_mdi(void) { - HWND mdi_hwndMain; + HWND mdi_hwndMain, mdi_client; + CLIENTCREATESTRUCT client_cs; + RECT rc; /*MSG msg;*/ if (!mdi_RegisterWindowClasses()) assert(0); @@ -1955,6 +2014,46 @@ GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); + + GetClientRect(mdi_hwndMain, &rc); + + client_cs.hWindowMenu = 0; + client_cs.idFirstChild = 1; + + /* MDIClient without MDIS_ALLCHILDSTYLES */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD /*| WS_VISIBLE*/, + /* tests depend on a not zero MDIClient size */ + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_create(mdi_hwndMain, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* MDIClient with MDIS_ALLCHILDSTYLES */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD | MDIS_ALLCHILDSTYLES /*| WS_VISIBLE*/, + /* tests depend on a not zero MDIClient size */ + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_create(mdi_hwndMain, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* Test child window stack management */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD, + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_child_stack(mdi_client); + DestroyWindow(mdi_client); /* while(GetMessage(&msg, 0, 0, 0)) { @@ -5726,11 +5825,12 @@ static void test_gettext(void) { DWORD tid, num_msgs; + WCHAR bufW[32]; HANDLE thread; BOOL success; char buf[32]; INT buf_len; - HWND hwnd; + HWND hwnd, hwnd2; LRESULT r; MSG msg; @@ -5744,6 +5844,68 @@ ok( buf_len != 0, "expected a nonempty window text\n" ); ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* other process window */ + strcpy( buf, "a" ); + buf_len = GetWindowTextA( GetDesktopWindow(), buf, sizeof(buf) ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( *buf == 0, "got wrong window text '%s'\n", buf ); + + strcpy( buf, "blah" ); + buf_len = GetWindowTextA( GetDesktopWindow(), buf, 0 ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "blah"), "got wrong window text '%s'\n", buf ); + + bufW[0] = 0xcc; + buf_len = GetWindowTextW( GetDesktopWindow(), bufW, 0 ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( bufW[0] == 0xcc, "got %x\n", bufW[0] ); + + g_wm_gettext_override.enabled = TRUE; + + num_gettext_msgs = 0; + memset( buf, 0xcc, sizeof(buf) ); + g_wm_gettext_override.buff = buf; + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *buf == 0, "got %x\n", *buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + strcpy( buf, "blah" ); + g_wm_gettext_override.buff = buf; + buf_len = GetWindowTextA( hwnd, buf, 0 ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( !strcmp(buf, "blah"), "got %s\n", buf ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + g_wm_gettext_override.enabled = FALSE; + + /* same for W window */ + hwnd2 = CreateWindowExW( 0, mainclassW, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd2 != 0, "CreateWindowExA error %d\n", GetLastError() ); + + g_wm_gettext_override.enabled = TRUE; + + num_gettext_msgs = 0; + memset( bufW, 0xcc, sizeof(bufW) ); + g_wm_gettext_override.buffW = bufW; + buf_len = GetWindowTextW( hwnd2, bufW, sizeof(bufW)/sizeof(WCHAR) ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *bufW == 0, "got %x\n", *bufW ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + memset( bufW, 0xcc, sizeof(bufW) ); + g_wm_gettext_override.buffW = bufW; + buf_len = GetWindowTextW( hwnd2, bufW, 0 ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *bufW == 0xcccc, "got %x\n", *bufW ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + g_wm_gettext_override.enabled = FALSE; + + DestroyWindow( hwnd2 ); /* test WM_GETTEXT */ num_gettext_msgs = 0; @@ -6324,10 +6486,12 @@ ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); sz.cx--; + SetLastError(0); ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); - ok( GetLastError() == ERROR_INCORRECT_SIZE || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND), - "wrong error %u\n", GetLastError() ); + /* particular error code differs from version to version, could be ERROR_INCORRECT_SIZE, + ERROR_MR_MID_NOT_FOUND or ERROR_GEN_FAILURE (Win8/Win10) */ + ok( GetLastError() != 0, "wrong error %u\n", GetLastError() ); info.dwFlags = ULW_OPAQUE; ret = pUpdateLayeredWindowIndirect( hwnd, &info ); ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); @@ -6954,6 +7118,33 @@ DestroyWindow( parent ); } +static void test_FlashWindow(void) +{ + HWND hwnd; + BOOL ret; + if (!pFlashWindow) + { + win_skip( "FlashWindow not supported\n" ); + return; + } + + hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_POPUP, + 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( NULL, TRUE ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); + + DestroyWindow( hwnd ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( hwnd, TRUE ); + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); +} + static void test_FlashWindowEx(void) { HWND hwnd; @@ -6977,13 +7168,13 @@ finfo.hwnd = NULL; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "FlashWindowEx returned with %d\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindowEx returned with %d\n", GetLastError()); finfo.hwnd = hwnd; SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -6993,13 +7184,13 @@ finfo.cbSize = sizeof(FLASHWINFO) - 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO) + 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO); @@ -7007,7 +7198,7 @@ SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx returned with %d\n", GetLastError()); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); @@ -7023,7 +7214,7 @@ SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7038,7 +7229,6 @@ finfo.dwFlags = FLASHW_STOP; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); -todo_wine ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); @@ -8044,6 +8234,224 @@ DestroyWindow(button); } +#define SET_FOREGROUND_STEAL_1 0x01 +#define SET_FOREGROUND_SET_1 0x02 +#define SET_FOREGROUND_STEAL_2 0x04 +#define SET_FOREGROUND_SET_2 0x08 +#define SET_FOREGROUND_INJECT 0x10 + +struct set_foreground_thread_params +{ + UINT msg_quit, msg_command; + HWND window1, window2, thread_window; + HANDLE command_executed; +}; + +static DWORD WINAPI set_foreground_thread(void *params) +{ + struct set_foreground_thread_params *p = params; + MSG msg; + + p->thread_window = CreateWindowExA(0, "static", "thread window", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 10, 10, 0, 0, 0, NULL); + SetEvent(p->command_executed); + + while(GetMessageA(&msg, 0, 0, 0)) + { + if (msg.message == p->msg_quit) + break; + + if (msg.message == p->msg_command) + { + if (msg.wParam & SET_FOREGROUND_STEAL_1) + { + SetForegroundWindow(p->thread_window); + check_wnd_state(p->thread_window, p->thread_window, p->thread_window, 0); + } + if (msg.wParam & SET_FOREGROUND_INJECT) + { + SendNotifyMessageA(p->window1, WM_ACTIVATEAPP, 0, 0); + } + if (msg.wParam & SET_FOREGROUND_SET_1) + { + SetForegroundWindow(p->window1); + check_wnd_state(0, p->window1, 0, 0); + } + if (msg.wParam & SET_FOREGROUND_STEAL_2) + { + SetForegroundWindow(p->thread_window); + check_wnd_state(p->thread_window, p->thread_window, p->thread_window, 0); + } + if (msg.wParam & SET_FOREGROUND_SET_2) + { + SetForegroundWindow(p->window2); + check_wnd_state(0, p->window2, 0, 0); + } + + SetEvent(p->command_executed); + continue; + } + + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + DestroyWindow(p->thread_window); + return 0; +} + +static void test_activateapp(HWND window1) +{ + HWND window2, test_window; + HANDLE thread; + struct set_foreground_thread_params thread_params; + DWORD tid; + MSG msg; + + window2 = CreateWindowExA(0, "static", "window 2", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 300, 0, 10, 10, 0, 0, 0, NULL); + thread_params.msg_quit = WM_USER; + thread_params.msg_command = WM_USER + 1; + thread_params.window1 = window1; + thread_params.window2 = window2; + thread_params.command_executed = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, set_foreground_thread, &thread_params, 0, &tid); + WaitForSingleObject(thread_params.command_executed, INFINITE); + + SetForegroundWindow(window1); + check_wnd_state(window1, window1, window1, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + /* Steal foreground: WM_ACTIVATEAPP(0) is delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + /* Active and Focus window are sometimes 0 on KDE. Ignore them. + * check_wnd_state(window1, thread_params.thread_window, window1, 0); */ + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + check_wnd_state(0, thread_params.thread_window, 0, 0); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + /* This message is reliable on Windows and inside a virtual desktop. + * It is unreliable on KDE (50/50) and never arrives on FVWM. + * ok(app_deactivated, "Expected WM_ACTIVATEAPP(0), did not receive it.\n"); */ + + /* Set foreground: WM_ACTIVATEAPP (1) is delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_SET_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + check_wnd_state(0, 0, 0, 0); + test_window = GetForegroundWindow(); + ok(!test_window, "Expected foreground window 0, got %p\n", test_window); + ok(!app_activated, "Received WM_ACTIVATEAPP(!= 0), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + check_wnd_state(window1, window1, window1, 0); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + ok(app_activated, "Expected WM_ACTIVATEAPP(1), did not receive it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + + /* Steal foreground then set it back: No messages are delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1 | SET_FOREGROUND_SET_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + + /* This is not implemented with a plain WM_ACTIVATEAPP filter. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1 + | SET_FOREGROUND_INJECT | SET_FOREGROUND_SET_1, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(app_deactivated, "Expected WM_ACTIVATEAPP(0), did not receive it.\n"); + + SetForegroundWindow(thread_params.thread_window); + + /* Set foreground then remove: Both messages are delivered. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_SET_1 | SET_FOREGROUND_STEAL_2, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + check_wnd_state(0, thread_params.thread_window, 0, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == thread_params.thread_window, "Expected foreground window %p, got %p\n", + thread_params.thread_window, test_window); + /* Active and focus are window1 on wine because the internal WM_WINE_SETACTIVEWINDOW(0) + * message is never generated. GetCapture() returns 0 though, so we'd get a test success + * in todo_wine in the line below. + * todo_wine check_wnd_state(0, thread_params.thread_window, 0, 0); */ + ok(app_activated, "Expected WM_ACTIVATEAPP(1), did not receive it.\n"); + todo_wine ok(app_deactivated, "Expected WM_ACTIVATEAPP(0), did not receive it.\n"); + + SetForegroundWindow(window1); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + + /* Switch to a different window from the same thread? No messages. */ + app_activated = app_deactivated = FALSE; + PostThreadMessageA(tid, thread_params.msg_command, SET_FOREGROUND_STEAL_1 | SET_FOREGROUND_SET_2, 0); + WaitForSingleObject(thread_params.command_executed, INFINITE); + test_window = GetForegroundWindow(); + ok(test_window == window1, "Expected foreground window %p, got %p\n", + window1, test_window); + check_wnd_state(window1, window1, window1, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + test_window = GetForegroundWindow(); + ok(test_window == window2, "Expected foreground window %p, got %p\n", + window2, test_window); + check_wnd_state(window2, window2, window2, 0); + ok(!app_activated, "Received WM_ACTIVATEAPP(1), did not expect it.\n"); + ok(!app_deactivated, "Received WM_ACTIVATEAPP(0), did not expect it.\n"); + + PostThreadMessageA(tid, thread_params.msg_quit, 0, 0); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread_params.command_executed); + DestroyWindow(window2); +} + START_TEST(win) { char **argv; @@ -8063,6 +8471,7 @@ pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); pGetProcessDefaultLayout = (void *)GetProcAddress( user32, "GetProcessDefaultLayout" ); pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); + pFlashWindow = (void *)GetProcAddress( user32, "FlashWindow" ); pFlashWindowEx = (void *)GetProcAddress( user32, "FlashWindowEx" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); @@ -8126,6 +8535,7 @@ test_capture_3(hwndMain, hwndMain2); test_capture_4(); test_rtl_layout(); + test_FlashWindow(); test_FlashWindowEx(); test_CreateWindow(); @@ -8177,6 +8587,11 @@ test_smresult(); test_GetMessagePos(); + if (!winetest_interactive) + skip("ROSTESTS-208: Skipping test_activateapp(hwndMain).\n"); + else + test_activateapp(hwndMain); + /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs