January 2016 - Wine-commits

Henri Verbeet : ddraw: Only allow DDSCAPS_MIPMAP on textures.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 521e3a44cfac3bdecc9ee2078f63a71e164623c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521e3a44cfac3bdecc9ee2078… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 15:52:07 2016 +0100 ddraw: Only allow DDSCAPS_MIPMAP on textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++++ dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + 5 files changed, 11 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9b845d2..3cf7a56 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5733,6 +5733,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if ((desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) && !(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS_MIPMAP requested without DDSCAPS_TEXTURE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8530066..25b988a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5003,6 +5003,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 6}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6}, }; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 66bb680..2e26c52 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6046,6 +6046,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 6}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6}, }; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f25516f..8b99eaa 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7578,6 +7578,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 6}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 6}, }; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3df6116..97ce7aa 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7427,6 +7427,7 @@ static void test_mipmap(void) {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 3, DD_OK, 3}, {DDSD_MIPMAPCOUNT, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDPARAMS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 1}, + {0, DDSCAPS_MIPMAP, 128, 32, 0, DDERR_INVALIDCAPS, 0}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 128, 32, 0, DD_OK, 8}, {0, DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP, 32, 64, 0, DD_OK, 7}, };

1 0

Nikolay Sivov : xaudio2: Added missing break in a switch (Coverity).
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: f9be2024dab321ec00f30ed5a806ea0a7a8c60ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9be2024dab321ec00f30ed5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 6 17:56:05 2016 +0300 xaudio2: Added missing break in a switch (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index e7176b2..1f5a91f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -449,6 +449,7 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) case 8: return AL_FORMAT_71CHN8; } + break; case 16: switch(fmt->nChannels){ case 1:

1 0

Nikolay Sivov : ieframe: Don' t write icon file path and index to storage if not specified in shortcut ( Valgrind).
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 41ff20886a2165005645f4da49bc7ef9e3650716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ff20886a2165005645f4da4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 1 19:51:59 2016 +0300 ieframe: Don't write icon file path and index to storage if not specified in shortcut (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 13 ++++-------- dlls/ieframe/tests/intshcut.c | 46 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index b2d3ba9..19b253d 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -506,8 +506,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); - get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); - if (iconfile != NULL) + if (get_profile_string(str_header, str_iconfile, pszFileName, &iconfile)) { PROPSPEC ps; PROPVARIANT pv; @@ -520,13 +519,10 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam { TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); } - - CoTaskMemFree(iconfile); } + CoTaskMemFree(iconfile); - get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); - - if (iconindexstring != NULL) + if (get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring)) { int iconindex; PROPSPEC ps; @@ -543,9 +539,8 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam { TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); } - - CoTaskMemFree(iconindexstring); } + CoTaskMemFree(iconindexstring); IPropertyStorage_Release(pPropStg); } diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 75c6cfb..2a5f2df 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -213,7 +213,7 @@ static void test_ReadAndWriteProperties(void) pv[0].vt = VT_LPWSTR; U(pv[0]).pwszVal = (void *) iconPath; pv[1].vt = VT_I4; - U(pv[1]).iVal = iconIndex; + U(pv[1]).lVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); @@ -261,16 +261,16 @@ static void test_ReadAndWriteProperties(void) hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); ok(hr == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hr); + memset(pvread, 0, sizeof(pvread)); hr = IPropertyStorage_ReadMultiple(pPropStgRead, 2, ps, pvread); + todo_wine /* Wine doesn't yet support setting properties after save */ + { ok(hr == S_OK, "Unable to read properties, hr=0x%x\n", hr); - - todo_wine /* Wine doesn't yet support setting properties after save */ - { - ok(U(pvread[1]).iVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); - - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); - } - + ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); + ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); + ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + } PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); IPropertyStorage_Release(pPropStgRead); @@ -335,6 +335,11 @@ static void test_Load(void) lstrcatW(file_path, test_urlW); for(test = load_tests; test < load_tests + sizeof(load_tests)/sizeof(*load_tests); test++) { + IPropertySetStorage *propsetstorage; + IPropertyStorage *propstorage; + PROPVARIANT v; + PROPSPEC ps; + file = CreateFileW(file_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "could not create test file\n"); if(file == INVALID_HANDLE_VALUE) @@ -351,6 +356,29 @@ static void test_Load(void) test_shortcut_url((IUnknown*)persist_file, test->url); + hres = IPersistFile_QueryInterface(persist_file, &IID_IPropertySetStorage, (void **)&propsetstorage); + ok(hres == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hres); + + hres = IPropertySetStorage_Open(propsetstorage, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &propstorage); + ok(hres == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hres); + + ps.ulKind = PRSPEC_PROPID; + U(ps).propid = PID_IS_ICONFILE; + v.vt = VT_NULL; + hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + ok(v.vt == VT_EMPTY, "got %d\n", v.vt); + + ps.ulKind = PRSPEC_PROPID; + U(ps).propid = PID_IS_ICONINDEX; + v.vt = VT_EMPTY; + hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + ok(v.vt == VT_EMPTY, "got %d\n", v.vt); + + IPropertyStorage_Release(propstorage); + IPropertySetStorage_Release(propsetstorage); + IPersistFile_Release(persist_file); DeleteFileW(file_path); }

1 0

Jared Smudde : winefile: Set MDI child icon.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 4b4288f86961055bcd0cb45af1502fe615f45738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4288f86961055bcd0cb45af… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Thu Dec 31 13:34:33 2015 -0600 winefile: Set MDI child icon. Signed-off-by: Jared Smudde <computerwhiz02(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 34830c5..9d3f0e1 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4214,7 +4214,7 @@ static void InitInstance(HINSTANCE hinstance) wcChild.cbClsExtra = 0; wcChild.cbWndExtra = 0; wcChild.hInstance = hinstance; - wcChild.hIcon = 0; + wcChild.hIcon = LoadIconW(hinstance, MAKEINTRESOURCEW(IDI_WINEFILE)); wcChild.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcChild.hbrBackground = 0; wcChild.lpszMenuName = 0;

1 0

Jared Smudde : shlwapi: Fix OS_TABLETPC typo.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 1c2dd4b3e750f0ab51232660fa317369ff6711e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2dd4b3e750f0ab51232660f… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Tue Jan 5 21:42:11 2016 -0600 shlwapi: Fix OS_TABLETPC typo. Signed-off-by: Jared Smudde <computerwhiz02(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 699fcc6..e3d021f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4045,7 +4045,7 @@ BOOL WINAPI IsOS(DWORD feature) case OS_SMALLBUSINESSSERVER: ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) case OS_TABLETPC: - FIXME("(OS_TABLEPC) What should we return here?\n"); + FIXME("(OS_TABLETPC) What should we return here?\n"); return FALSE; case OS_SERVERADMINUI: FIXME("(OS_SERVERADMINUI) What should we return here?\n");

1 0

Jacek Caban : jscript: Added support for Function constructor called as a function.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: d7e4193df2f22a87031e44ce358a626a5f92b295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e4193df2f22a87031e44ce3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 6 16:29:42 2016 +0100 jscript: Added support for Function constructor called as a function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 1 + dlls/jscript/tests/api.js | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 0ac6c61..dcddf59 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -821,6 +821,7 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla TRACE("\n"); switch(flags) { + case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { IDispatch *ret; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f4f42b0..78145c6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1869,6 +1869,16 @@ ok(tmp === undefined, "func() = " + tmp); tmp = func.toString(); ok(tmp == "function anonymous() {\n\n}", "func.toString() = " + tmp); +// Function constructor called as function +func = Function("return 3;"); + +tmp = func(); +ok(tmp === 3, "func() = " + tmp); +ok(func.call() === 3, "func.call() = " + tmp); +ok(func.length === 0, "func.length = " + func.length); +tmp = func.toString(); +ok(tmp === "function anonymous() {\nreturn 3;\n}", "func.toString() = " + tmp); + func = (function() { var tmp = 3; return new Function("return tmp;");

1 0

Sebastian Lackner : ntdll: Check ContextFlags before restoring registers on x86_64.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 897ac569c84d9be42e0b4bbd718a3eb05663e4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897ac569c84d9be42e0b4bbd7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:40:46 2016 +0100 ntdll: Check ContextFlags before restoring registers on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 524de68..0c64541 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1800,11 +1800,12 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "ret" ); /*********************************************************************** - * set_cpu_context + * set_full_cpu_context * * Set the new CPU context. */ -__ASM_GLOBAL_FUNC( set_cpu_context, +extern void set_full_cpu_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_full_cpu_context, "subq $40,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ @@ -1852,6 +1853,25 @@ __ASM_GLOBAL_FUNC( set_cpu_context, "movq 0xb0(%rdi),%rdi\n\t" /* context->Rdi */ "iretq" ); + +/*********************************************************************** + * set_cpu_context + * + * Set the new CPU context. Used by NtSetContextThread. + */ +void set_cpu_context( const CONTEXT *context ) +{ + DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; + if (flags & CONTEXT_FULL) + { + if (!(flags & CONTEXT_CONTROL)) + FIXME( "setting partial context (%x) not supported\n", flags ); + else + set_full_cpu_context( context ); + } +} + + /*********************************************************************** * copy_context *

1 0

Sebastian Lackner : ntdll: Receive debug registers from server on x86_64.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 7c468f8eca3af45eb8d8422f161c3f9782e55370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c468f8eca3af45eb8d8422f1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:41:01 2016 +0100 ntdll: Receive debug registers from server on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index aaf7a71..1455eb1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -830,9 +830,11 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) DWORD needed_flags = context->ContextFlags; BOOL self = (handle == GetCurrentThread()); + /* on i386/amd64 debug registers always require a server call */ #ifdef __i386__ - /* on i386 debug registers always require a server call */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) self = FALSE; +#elif defined(__x86_64__) + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) self = FALSE; #endif if (!self)

1 0

Sebastian Lackner : ntdll/tests: Add tests for setting debug registers with NtSetContextThread.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 6483c07b4e06caecbe5e6076e8ddd837a90a3e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6483c07b4e06caecbe5e6076e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:41:19 2016 +0100 ntdll/tests: Add tests for setting debug registers with NtSetContextThread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a368997..bd2fa40 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1723,6 +1723,50 @@ static void test_dynamic_unwind(void) #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) + +static void test_debug_registers(void) +{ + static const struct + { + ULONG_PTR dr0, dr1, dr2, dr3, dr6, dr7; + } + tests[] = + { + { 0x42424240, 0, 0x126bb070, 0x0badbad0, 0, 0xffff0115 }, + { 0x42424242, 0, 0x100f0fe7, 0x0abebabe, 0, 0x115 }, + }; + NTSTATUS status; + CONTEXT ctx; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + ctx.Dr0 = tests[i].dr0; + ctx.Dr1 = tests[i].dr1; + ctx.Dr2 = tests[i].dr2; + ctx.Dr3 = tests[i].dr3; + ctx.Dr6 = tests[i].dr6; + ctx.Dr7 = tests[i].dr7; + + status = pNtSetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08x\n", status); + + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + + status = pNtGetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08x\n", status); + ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %lx, got %lx\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0); + ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %lx, got %lx\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1); + ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %lx, got %lx\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2); + ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %lx, got %lx\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3); + ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %lx, got %lx\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); + ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %lx, got %lx\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); + } +} + static DWORD outputdebugstring_exceptions; static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -1946,6 +1990,7 @@ START_TEST(exception) test_unwind(); test_exceptions(); test_rtlraiseexception(); + test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); test_vectored_continue_handler(); @@ -1965,6 +2010,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); + test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); test_vectored_continue_handler();

1 0

Hugh McMaster : user32/tests: Add message tests for EM_SETSEL when getting /losing focus in combo boxes.
by Alexandre Julliard 06 Jan '16

06 Jan '16

Module: wine Branch: master Commit: 75d95f68863b924958b3f7558311f6725fb6611c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d95f68863b924958b3f7558… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sat Jan 2 22:55:26 2016 +1100 user32/tests: Add message tests for EM_SETSEL when getting/losing focus in combo boxes. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bf1dab2..7d6c99a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -24,6 +24,7 @@ #define WINVER 0x0600 /* for WM_GETTITLEBARINFOEX */ #include <assert.h> +#include <limits.h> #include <stdarg.h> #include <stdio.h> @@ -5936,7 +5937,96 @@ static const struct message WmSetPosComboSeq[] = { 0 } }; -static WNDPROC old_combobox_proc; +static const struct message WMSetFocusComboBoxSeq[] = +{ + { WM_SETFOCUS, sent }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|defwinproc }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, INT_MAX }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SETFOCUS) }, + { 0 } +}; + +static const struct message SetFocusButtonSeq[] = +{ + { WM_KILLFOCUS, sent }, + { CB_GETCOMBOBOXINFO, sent|optional },/* Windows 2000 */ + { 0x0167, sent|optional },/* Undocumented message. Sent on all versions except Windows 2000 */ + { WM_LBUTTONUP, sent|defwinproc }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDCANCEL) }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_KILLFOCUS) }, + { WM_CTLCOLORBTN, sent|parent }, + { 0 } +}; + +static const struct message SetFocusComboBoxSeq[] = +{ + { WM_CTLCOLORBTN, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|defwinproc }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, INT_MAX }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SETFOCUS) }, + { 0 } +}; + +static const struct message SetFocusButtonSeq2[] = +{ + { WM_KILLFOCUS, sent }, + { CB_GETCOMBOBOXINFO, sent|optional },/* Windows 2000 */ + { 0x0167, sent|optional },/* Undocumented message. Sent on all versions except Windows 2000 */ + { WM_LBUTTONUP, sent|defwinproc }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDCANCEL) }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_CTLCOLOREDIT, sent|defwinproc }, + { WM_CTLCOLOREDIT, sent|parent }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_KILLFOCUS) }, + { WM_CTLCOLORBTN, sent|parent }, + { 0 } +}; + +static WNDPROC old_combobox_proc, edit_window_proc; + +static LRESULT CALLBACK combobox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct recvd_message msg; + + /* do not log painting messages */ + if (message != WM_PAINT && + message != WM_NCPAINT && + message != WM_SYNCPAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + message != WM_GETTEXT && + !ignore_message( message )) + { + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "combo"; + add_message(&msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(edit_window_proc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -5987,8 +6077,11 @@ static void subclass_combobox(void) static void test_combobox_messages(void) { - HWND parent, combo; + HWND parent, combo, button, edit; LRESULT ret; + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + COMBOBOXINFO cbInfo; + BOOL res; subclass_combobox(); @@ -6029,6 +6122,65 @@ static void test_combobox_messages(void) DestroyWindow(combo); DestroyWindow(parent); + + /* Start again. Test combobox text selection when getting and losing focus */ + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + parent = CreateWindowExA(0, "TestParentClass", "Parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 10, 300, 300, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + combo = CreateWindowExA(0, "my_combobox_class", "test", WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 5, 5, 100, 100, parent, (HMENU)ID_COMBOBOX, NULL, NULL); + ok(combo != 0, "Failed to create combobox window\n"); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + res = pGetComboBoxInfo(combo, &cbInfo); + ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + edit = cbInfo.hwndItem; + + edit_window_proc = (WNDPROC)SetWindowLongPtrA(edit, GWLP_WNDPROC, (ULONG_PTR)combobox_subclass_proc); + + button = CreateWindowExA(0, "Button", "OK", WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, + 5, 50, 100, 20, parent, NULL, + (HINSTANCE)GetWindowLongPtrA(parent, GWLP_HINSTANCE), NULL); + ok(button != 0, "Failed to create button window\n"); + + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, WM_SETFOCUS, 0, (LPARAM)edit); + log_all_parent_messages--; + ok_sequence(WMSetFocusComboBoxSeq, "WM_SETFOCUS on a ComboBox", TRUE); + + flush_sequence(); + log_all_parent_messages++; + SetFocus(button); + log_all_parent_messages--; + ok_sequence(SetFocusButtonSeq, "SetFocus on a Button", TRUE); + + SendMessageA(combo, WM_SETTEXT, 0, (LPARAM)"Wine Test"); + + flush_sequence(); + log_all_parent_messages++; + SetFocus(combo); + log_all_parent_messages--; + ok_sequence(SetFocusComboBoxSeq, "SetFocus on a ComboBox", TRUE); + + flush_sequence(); + log_all_parent_messages++; + SetFocus(button); + log_all_parent_messages--; + ok_sequence(SetFocusButtonSeq2, "SetFocus on a Button (2)", TRUE); + + DestroyWindow(button); + DestroyWindow(combo); + DestroyWindow(parent); } /****************** WM_IME_KEYDOWN message test *******************/

1 0