November 2017 - Wine-devel - list.winehq.org

[PATCH] webservices: Stub WsAbortChannel().
by Zebediah Figura 16 Nov '17

16 Nov '17

Powerpoint 2016 calls this while loading some themes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/webservices/channel.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 2662cd7cf7a..9b4fa8142b3 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1271,3 +1271,12 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + FIXME( "%p %p: stub!\n" ); + return WS_E_NOT_SUPPORTED; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8aa9fe9ad33..3469fedbfe6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -1,6 +1,6 @@ @ stub WsAbandonCall @ stub WsAbandonMessage -@ stub WsAbortChannel +@ stdcall WsAbortChannel(ptr ptr) @ stub WsAbortListener @ stub WsAbortServiceHost @ stdcall WsAbortServiceProxy(ptr ptr) -- 2.15.0

1 0

Re: [v3] cmd: Added support for "&&" and "||" condition checking.
by Jacek Caban 16 Nov '17

16 Nov '17

Hi Alexander, On 06.11.2017 02:51, Alexander Coffin wrote: > Fixes: https://bugs.winehq.org/show_bug.cgi?id=32679 > > This version (v3) is now completely c89 compliant. The previous > had a one line issue that was not. > > Before "&&" and "||" were supported, but they also didn't check if past > commands had failed. This commit removes direct access to errorlevel. > Now errorlevel can only be accessed using getters and setters, but the > it seemed like the most efficient solution. Also please note I added one > TODO task. Currently this commit doesn't replicate a certain windows > bug with setting errorlevel to 1 in some cases. See test_builtins.cmd > for more details. > > I would have checked the success/failure of commands that don't set the > errorlevel if that was possible, but Winows doesn't do that. It doesn't > care about the most recent statement, it only cares about the > errorlevel if it changes, otherwise it assumes success (if the > errorlevel doesn't change). I must admit that depending on the fact if errorlevel changed looks questionable to me. You probably mostly want to handle cases of successes that don't end up clearing errorlevel, but there are other ways to do that. While looking for info about this, I found a very nice answer on Stackoverflow: https://stackoverflow.com/questions/34936240/batch-goto-loses-errorlevel/34… What I like about this is that it covers everything with tests (although I didn't verify results myself). It seems to prove that the actual success of commands is separated from errorlevel and should be handled separately. I think it would make sense to preserve actual command result and handle it separately from errorlevel. Then we could use that to decide on failure/success in || and && operators. Implementing that is a bit more work than this patch. I think we'd want WCMD_execute to return int representing executed command return code (that means that WCMD_if, WCMD_for, WCMD_move, ECMD_run_program and alike will also have to do it). Once you have that, you can simply use returned value to properly handle && and || operators. How does that sound to you? Thanks, Jacek

1 0

[PATCH 4/4] ntdll: Limit address space to 512GB on ARM64
by André Hentschel 16 Nov '17

16 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/virtual.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d28b138..2518c82 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1582,7 +1582,9 @@ void virtual_init(void) assert( !(page_size & page_mask) ); page_shift = 0; while ((1 << page_shift) != page_size) page_shift++; -#ifdef _WIN64 +#ifdef __aarch64__ + address_space_limit = (void *)(((1UL << 39) - 1) & ~page_mask); +#elif defined(_WIN64) address_space_limit = (void *)(((1UL << 47) - 1) & ~page_mask); #else address_space_limit = (void *)~page_mask; -- 2.7.4

2 2

[PATCH v3 1/2] include: Add roparameterizediid.idl
by Alex Henrie 16 Nov '17

16 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: Imported wtypes.idl to fix compilation error. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 95 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..b133ba4c7a --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,95 @@ +/* + * Copyright 2017 Alex Henrie + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "wtypes.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

2 1

[PATCH 3/3] user32: Send WM_IME_CHAR messages from DefWindowProc.
by Akihiro Sagawa 16 Nov '17

16 Nov '17

In native, default IME window doesn't handle WM_IME_COMPOSITION(GCS_RESULTSTR). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 8 +----- dlls/user32/defwnd.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/ime.c | 58 +--------------------------------------- dlls/winex11.drv/ime.c | 60 +---------------------------------------- 4 files changed, 70 insertions(+), 125 deletions(-)

2 1

[PATCH 2/3] imm32/tests: Add more WM_IME_CHAR message tests.
by Akihiro Sagawa 16 Nov '17

16 Nov '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)

2 1

[PATCH] msvcp: Trace delimiter characters as single char strings
by Nikolay Sivov 16 Nov '17

16 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Otherwise newline delimiter causes actual newline to be inserted in trace message, splitting it to next line. dlls/msvcp60/ios.c | 16 ++++++++-------- dlls/msvcp90/ios.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f5dabbfa42..fea2adee16 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7932,7 +7932,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -7978,7 +7978,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8022,7 +8022,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8724,7 +8724,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); MSVCP_basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { @@ -9400,7 +9400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -9450,7 +9450,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -9498,7 +9498,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10397,7 +10397,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); MSVCP_basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5d2f0ca9c6..9ae9e65b93 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8414,7 +8414,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8460,7 +8460,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8504,7 +8504,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -9271,7 +9271,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); @@ -9957,7 +9957,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10007,7 +10007,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -10055,7 +10055,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -11018,7 +11018,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); -- 2.15.0

2 1

[PATCH] rsaenh: CALG_AES is not supported.
by Huw Davies 16 Nov '17

16 Nov '17

This is the correct fix for what commit f5c687e3652004e4efebe9352aadd02d179603cf was trying to fix. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/rsaenh/rsaenh.c | 13 +------------ dlls/rsaenh/tests/rsaenh.c | 9 +++++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index f2f5960fee..fdf410a4ed 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -242,7 +242,6 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_DES, 56, 56, 56, 0, S("DES"), S("Data Encryption Standard (DES)")}, {CALG_3DES_112, 112, 112, 112, 0, S("3DES TWO KEY"), S("Two Key Triple DES")}, {CALG_3DES, 168, 168, 168, 0, S("3DES"), S("Three Key Triple DES")}, - {CALG_AES, 128, 128, 128, 0, S("AES"), S("Advanced Encryption Standard (AES)")}, {CALG_AES_128, 128, 128, 128, 0, S("AES-128"), S("Advanced Encryption Standard (AES-128)")}, {CALG_AES_192, 192, 192, 192, 0, S("AES-192"), S("Advanced Encryption Standard (AES-192)")}, {CALG_AES_256, 256, 256, 256, 0, S("AES-256"), S("Advanced Encryption Standard (AES-256)")}, @@ -791,7 +790,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { HCRYPTKEY hCryptKey; CRYPTKEY *pCryptKey; - DWORD dwKeyLen = HIWORD(dwFlags), bKeyLen = dwKeyLen; + DWORD dwKeyLen = HIWORD(dwFlags); const PROV_ENUMALGS_EX *peaAlgidInfo; *ppCryptKey = NULL; @@ -850,14 +849,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK */ break; - case CALG_AES: - if (!bKeyLen) - { - TRACE("missing key len for CALG_AES\n"); - SetLastError(NTE_BAD_ALGID); - return (HCRYPTKEY)INVALID_HANDLE_VALUE; - } - /* fall through */ default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || @@ -924,7 +915,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwMode = CRYPT_MODE_CBC; break; - case CALG_AES: case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: @@ -3197,7 +3187,6 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP case CALG_DES: case CALG_3DES_112: case CALG_3DES: - case CALG_AES: case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c9532b2bcc..bc8e798cdd 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -224,6 +224,15 @@ static BOOL init_aes_environment(void) result = CryptGenKey(hProv, AT_SIGNATURE, 0, &hKey); ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); + + /* CALG_AES is not supported, but CALG_AES_128 is */ + result = CryptGenKey(hProv, CALG_AES, 0, &hKey); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%d %08x\n", result, GetLastError()); + result = CryptGenKey(hProv, CALG_AES, 128 << 16, &hKey); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%d %08x\n", result, GetLastError()); + result = CryptGenKey(hProv, CALG_AES_128, 0, &hKey); + ok(result, "%08x\n", GetLastError()); + if (result) CryptDestroyKey(hKey); } return TRUE; } -- 2.12.0

1 0

[PATCH v4 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 16 Nov '17

16 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/dialog.c | 1 + dlls/user32/menu.c | 3 +++ dlls/user32/tests/input.c | 11 ++++++++++- dlls/user32/tests/win.c | 7 +++++++ dlls/winex11.drv/x11drv.h | 7 ++++++- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c2aad8d..46220b0 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -283,6 +283,7 @@ static BOOL DIALOG_CreateControls32( HWND hwnd, LPCSTR template, const DLG_TEMPL WARN("control %s %s creation failed\n", debugstr_w(info.className), debugstr_w(info.windowName)); if (dlgTemplate->style & DS_NOFAILCREATE) continue; + SetLastError(0); return FALSE; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index a5f2317..1ba9638 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3505,8 +3505,10 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, GetClassLongW( hWnd, GCL_STYLE)); if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) + { ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL ); + } MENU_ExitTracking(hWnd, TRUE); if (menu->hWnd) @@ -3518,6 +3520,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, SendMessageW( hWnd, WM_UNINITMENUPOPUP, (WPARAM)hMenu, MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); } + SetLastError(0); } return ret; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..6ce03f8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,17 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b529284..dae34e4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6261,6 +6261,13 @@ static void test_CreateWindow(void) ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + /* invalid class */ + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, "INVALID_CLASS", NULL, WS_CHILD, 10, 10, 100, 100, parent, 0, 0, NULL); + ok(hwnd == 0, "CreateWindowEx succeeded\n"); + ok(GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "CreateWindowEx error %d\n", GetLastError()); + DestroyWindow(hwnd); + if (pGetLayout && pSetLayout) { HDC hdc = GetDC( parent ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

2 3

[PATCH 3/5] ntdll: Add support for junction point creation.
by Daniel Lehman 15 Nov '17

15 Nov '17

1 0