December 2017 - Wine-commits

Dmitry Timoshkov : wine.inf: Add "Security Packages" key.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: e5e556bf8505de7cf0a25b47111739b249deeb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e556bf8505de7cf0a25b471… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 13 12:45:04 2017 +0800 wine.inf: Add "Security Packages" key. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d88e4ff..a991319 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -683,6 +683,7 @@ HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 +HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"

1 0

Dmitry Timoshkov : bcrypt: Add some crypto-provider related stubs.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 76bc8d01c0461d12cc6f7ee96ad632145d1a64bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bc8d01c0461d12cc6f7ee96… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 13 12:45:42 2017 +0800 bcrypt: Add some crypto-provider related stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 12 ++++++------ dlls/bcrypt/bcrypt_main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 12 ++++++------ include/bcrypt.h | 23 +++++++++++++++++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 9ecd21d..f00f55c 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) @ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -39,9 +39,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -49,7 +49,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) @ stub BCryptVerifySignature @ stub GetAsymmetricEncryptionInterface @ stub GetCipherInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 765f758..3bdc463 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -122,6 +122,42 @@ static void gnutls_uninitialize(void) } #endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ +NTSTATUS WINAPI BCryptAddContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptAddContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptRemoveContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function) +{ + FIXME("%08x, %s, %08x, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider) +{ + FIXME("%08x, %s, %08x, %s, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) +{ + FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptUnregisterProvider(LPCWSTR provider) +{ + FIXME("%s: stub\n", debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1a78853..5d37121 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) bcrypt.BCryptAddContextFunction +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider @ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -42,9 +42,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -52,7 +52,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider @ stub BCryptVerifySignature @ stub GetIsolationServerInterface @ stub GetKeyStorageInterface diff --git a/include/bcrypt.h b/include/bcrypt.h index 7c3c8d0..1f7093c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -94,6 +94,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT ULONG dwIncrement; } BCRYPT_KEY_LENGTHS_STRUCT; +typedef struct _CRYPT_INTERFACE_REG +{ + ULONG dwInterface; + ULONG dwFlags; + ULONG cFunctions; + PWSTR *rgpszFunctions; +} CRYPT_INTERFACE_REG, *PCRYPT_INTERFACE_REG; + +typedef struct _CRYPT_IMAGE_REG +{ + PWSTR pszImage; + ULONG cInterfaces; + PCRYPT_INTERFACE_REG *rgpInterfaces; +} CRYPT_IMAGE_REG, *PCRYPT_IMAGE_REG; + +typedef struct _CRYPT_PROVIDER_REG +{ + ULONG cAliases; + PWSTR *rgpszAliases; + PCRYPT_IMAGE_REG pUM; + PCRYPT_IMAGE_REG pKM; +} CRYPT_PROVIDER_REG, *PCRYPT_PROVIDER_REG; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE;

1 0

Henri Verbeet : include: Remove some superfluous semicolons.
by Alexandre Julliard 14 Dec '17

14 Dec '17

1 0

Alex Henrie : include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 224d284f99416ef5b56cd36284d289447a7f5edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=224d284f99416ef5b56cd3628… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 13 23:23:28 2017 -0700 include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/exception.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 5bc4d1c..8e3f481 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -61,10 +61,12 @@ extern "C" { * use GetExceptionInformation() and GetExceptionCode() to retrieve the * exception info. * - * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements - * break out of the current block. You cannot use 'return', 'goto' - * or 'longjmp' to leave a __TRY block, as this will surely crash. - * You can use them to leave a __EXCEPT block though. + * Warning: Inside a __TRY or __EXCEPT block, 'break' or 'continue' statements + * break out of the current block, but avoid using them because they + * won't work when compiling with native exceptions. You cannot use + * 'return', 'goto', or 'longjmp' to leave a __TRY block either, as + * this will surely crash. You can use 'return', 'goto', or 'longjmp' + * to leave an __EXCEPT block though. * * -- AJ */

1 0

Nikolay Sivov : user32/tests: Release window DCs consistently.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 0a953f117a068080f69acd7c60a72f852377d7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a953f117a068080f69acd7c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:48:08 2017 +0300 user32/tests: Release window DCs consistently. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 ++ dlls/user32/tests/static.c | 1 + dlls/user32/tests/sysparams.c | 3 ++- dlls/user32/tests/win.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 61b32e0..211376b 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1070,6 +1070,8 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + + ReleaseDC(NULL, hdc); } static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 929b50d..8776c3a 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -99,6 +99,7 @@ static void test_updates(int style, int flags) HDC hdc = GetDC( hStatic); COLORREF colour = GetPixel( hdc, 10, 10); ok ( colour != 0, "pixel should NOT be painted black!\n"); + ReleaseDC(hStatic, hdc); } if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fa473c1..5dd8e58 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2918,7 +2918,8 @@ static void test_GetSystemMetrics( void) trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } - ReleaseDC( 0, hdc); + + DeleteDC(hdc); } static void test_EnumDisplaySettings(void) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e72cbc..db27b6b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5242,6 +5242,7 @@ static void test_scrolldc( HWND parent) if (winetest_debug > 0) dump_region(hrgn); /* clean up */ + ReleaseDC(hwnd1, hdc); DeleteObject(hrgn); DeleteObject(exprgn); DeleteObject(tmprgn);

1 0

Nikolay Sivov : comctl32/tests: Rename test file.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: d6c6790cb1157d5f4114df706fa37fb854c0f7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c6790cb1157d5f4114df706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:19 2017 +0300 comctl32/tests: Rename test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/{comboex.c => combo.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 5faf1f8..ad298f8 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = comctl32 ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ button.c \ - comboex.c \ + combo.c \ datetime.c \ dpa.c \ header.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/combo.c similarity index 99% rename from dlls/comctl32/tests/comboex.c rename to dlls/comctl32/tests/combo.c index fede917..4504ce9 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/combo.c @@ -594,7 +594,7 @@ static void test_get_set_item(void) DestroyWindow(hComboEx); } -START_TEST(comboex) +START_TEST(combo) { if (!init()) return;

1 0

Nikolay Sivov : comctl32/tests: Add ComboBox tests.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 0b907389cf6e22c7708b69ebe2a44804f88a61e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b907389cf6e22c7708b69ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:20 2017 +0300 comctl32/tests: Add ComboBox tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 639 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 614 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b907389cf6e22c7708b6…

1 0

Nikolay Sivov : comctl32/tests: Add Static control tests.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: c170a483232f8ecf89e0d12408bd7a70730fdf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c170a483232f8ecf89e0d1240… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:21 2017 +0300 comctl32/tests: Add Static control tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/static.c | 177 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index ad298f8..36d77f0 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ progress.c \ propsheet.c \ rebar.c \ + static.c \ status.c \ subclass.c \ syslink.c \ diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c new file mode 100644 index 0000000..890fcf5 --- /dev/null +++ b/dlls/comctl32/tests/static.c @@ -0,0 +1,177 @@ +/* Unit test suite for static controls. + * + * Copyright 2007 Google (Mikolaj Zalewski) + * + * 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 <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +#include "v6util.h" + +#define TODO_COUNT 1 + +#define CTRL_ID 1995 + +static HWND hMainWnd; +static int g_nReceivedColorStatic; + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + +static HWND create_static(DWORD style) +{ + return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wparam; + HRGN hrgn = CreateRectRgn(0, 0, 1, 1); + ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n"); + DeleteObject(hrgn); + g_nReceivedColorStatic++; + return (LRESULT) GetStockObject(BLACK_BRUSH); + } + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_updates(int style, int flags) +{ + HWND hStatic = create_static(style); + RECT r1 = {20, 20, 30, 30}; + int exp; + + flush_events(); + g_nReceivedColorStatic = 0; + /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ + InvalidateRect(hMainWnd, NULL, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hMainWnd, &r1, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hStatic, &r1, FALSE); + UpdateWindow(hStatic); + InvalidateRect(hStatic, NULL, FALSE); + UpdateWindow(hStatic); + + if ((style & SS_TYPEMASK) == SS_BITMAP) + { + HDC hdc = GetDC(hStatic); + COLORREF colour = GetPixel(hdc, 10, 10); + todo_wine + ok(colour == 0, "Unexpected pixel color.\n"); + ReleaseDC(hStatic, hdc); + } + + if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) + exp = 4; + else + exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + + if (flags & TODO_COUNT) + todo_wine + ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) + ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); + else + ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + DestroyWindow(hStatic); +} + +static void test_set_text(void) +{ + HWND hStatic = create_static(SS_SIMPLE); + char buffA[10]; + + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(!strcmp(buffA, "Test"), "got wrong text %s\n", buffA); + + SetWindowTextA(hStatic, NULL); + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(buffA[0] == 0, "got wrong text %s\n", buffA); + + DestroyWindow(hStatic); +} + +START_TEST(static) +{ + static const char classname[] = "testclass"; + WNDCLASSEXA wndclass; + ULONG_PTR ctx_cookie; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszClassName = classname; + wndclass.lpszMenuName = NULL; + RegisterClassExA(&wndclass); + + hMainWnd = CreateWindowA(classname, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ShowWindow(hMainWnd, SW_SHOW); + + test_updates(0, 0); + test_updates(SS_SIMPLE, 0); + test_updates(SS_ICON, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); + test_updates(SS_BLACKRECT, TODO_COUNT); + test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, TODO_COUNT); + test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_set_text(); + + DestroyWindow(hMainWnd); + + unload_v6_module(ctx_cookie, hCtx); +}

1 0

Alexandre Julliard : ntdll: Run the thread/ process detach code on the thread stack.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 7e9f1878dbaa5729c47b3b373e20fc22d2311a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9f1878dbaa5729c47b3b373… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 10:54:56 2017 +0100 ntdll: Run the thread/process detach code on the thread stack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/signal_arm.c | 12 ++++++------ dlls/ntdll/signal_arm64.c | 12 ++++++------ dlls/ntdll/signal_i386.c | 12 ++++++------ dlls/ntdll/signal_powerpc.c | 12 ++++++------ dlls/ntdll/signal_x86_64.c | 12 ++++++------ dlls/ntdll/thread.c | 24 ++++++++++++++---------- 7 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c9c79fb..80bca0c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -69,6 +69,8 @@ extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) DECLSPEC_HIDDEN; extern void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern HANDLE thread_init(void) DECLSPEC_HIDDEN; @@ -86,7 +88,6 @@ extern void server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; -extern void DECLSPEC_NORETURN terminate_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 64ff1e0..dcb4564 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1233,7 +1233,7 @@ static void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - exit_thread( entry( arg )); + RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) { @@ -1302,19 +1302,19 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) } /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { exit_thread( status ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - terminate_thread( status ); + exit( status ); } /********************************************************************** diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 6905ab4..a04fe93 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -965,7 +965,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - exit_thread( entry( arg )); + RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) { @@ -1034,19 +1034,19 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) } /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { exit_thread( status ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - terminate_thread( status ); + exit( status ); } /********************************************************************** diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 351b67c..4be573e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2989,21 +2989,21 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { if (!x86_thread_data()->exit_frame) exit_thread( status ); call_thread_exit_func( status, exit_thread, x86_thread_data()->exit_frame ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - if (!x86_thread_data()->exit_frame) terminate_thread( status ); - call_thread_exit_func( status, terminate_thread, x86_thread_data()->exit_frame ); + if (!x86_thread_data()->exit_frame) exit( status ); + call_thread_exit_func( status, exit, x86_thread_data()->exit_frame ); } /********************************************************************** diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 234fdc4..3182a13 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1143,7 +1143,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - exit_thread( entry( arg )); + RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) { @@ -1212,19 +1212,19 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) } /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { exit_thread( status ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - terminate_thread( status ); + exit( status ); } /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c955c4c..1f76640 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4160,21 +4160,21 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { if (!amd64_thread_data()->exit_frame) exit_thread( status ); call_thread_exit_func( status, exit_thread, amd64_thread_data()->exit_frame ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - if (!amd64_thread_data()->exit_frame) terminate_thread( status ); - call_thread_exit_func( status, terminate_thread, amd64_thread_data()->exit_frame ); + if (!amd64_thread_data()->exit_frame) exit( status ); + call_thread_exit_func( status, exit, amd64_thread_data()->exit_frame ); } /********************************************************************** diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7b726ab..6abfd85 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -426,13 +426,21 @@ static void free_thread_data( TEB *teb ) /*********************************************************************** - * terminate_thread + * abort_thread */ -void terminate_thread( int status ) +void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); + signal_exit_thread( status ); +} + +/*********************************************************************** + * exit_thread + */ +void exit_thread( int status ) +{ close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); @@ -442,9 +450,9 @@ void terminate_thread( int status ) /*********************************************************************** - * exit_thread + * RtlExitUserThread (NTDLL.@) */ -void exit_thread( int status ) +void WINAPI RtlExitUserThread( ULONG status ) { static void *prev_teb; TEB *teb; @@ -463,7 +471,7 @@ void exit_thread( int status ) if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) { LdrShutdownProcess(); - exit( status ); + signal_exit_process( status ); } LdrShutdownThread(); @@ -482,11 +490,7 @@ void exit_thread( int status ) } } - close( ntdll_get_thread_data()->wait_fd[0] ); - close( ntdll_get_thread_data()->wait_fd[1] ); - close( ntdll_get_thread_data()->reply_fd ); - close( ntdll_get_thread_data()->request_fd ); - pthread_exit( UIntToPtr(status) ); + signal_exit_thread( status ); }

1 0

Alexandre Julliard : ntdll: Fix handling of floating point arguments in relay debugging on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 5e3534ee411a8c5baea5022705eac0e3c7f3cc70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3534ee411a8c5baea502270… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 11:44:57 2017 +0100 ntdll: Fix handling of floating point arguments in relay debugging on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 114 ++++++++++++++++++++++++++++++++++------------- tools/winebuild/spec32.c | 16 +++---- 2 files changed, 92 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 5d78420..a0c3cb1 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -468,6 +468,10 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi struct relay_private_data *data = descr->private; struct relay_entry_point *entry_point = data->entry_points + ordinal; unsigned int i, pos; +#ifndef __SOFTFP__ + unsigned int float_pos = 0, double_pos = 0; + const union fpregs { float s[16]; double d[8]; } *fpstack = (const union fpregs *)stack - 1; +#endif TRACE( "\1Call %s(", func_name( data, ordinal )); @@ -476,6 +480,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi switch (arg_types[i]) { case 'j': /* int64 */ + pos = (pos + 1) & ~1; TRACE( "%x%08x", stack[pos+1], stack[pos] ); pos += 2; break; @@ -489,6 +494,30 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi case 'w': /* wstr */ trace_string_w( stack[pos++] ); break; + case 'f': /* float */ +#ifndef __SOFTFP__ + if (!(float_pos % 2)) float_pos = max( float_pos, double_pos * 2 ); + if (float_pos < 16) + { + TRACE( "%g", fpstack->s[float_pos++] ); + break; + } +#endif + TRACE( "%g", *(const float *)&stack[pos++] ); + break; + case 'd': /* double */ +#ifndef __SOFTFP__ + double_pos = max( (float_pos + 1) / 2, double_pos ); + if (double_pos < 8) + { + TRACE( "%g", fpstack->d[double_pos++] ); + break; + } +#endif + pos = (pos + 1) & ~1; + TRACE( "%g", *(const double *)&stack[pos] ); + pos += 2; + break; case 'i': /* long */ default: TRACE( "%08x", stack[pos++] ); @@ -496,6 +525,14 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi } if (!is_ret_val( arg_types[i+1] )) TRACE( "," ); } + +#ifndef __SOFTFP__ + if (float_pos || double_pos) + { + pos |= 0x80000000; + stack = (const DWORD *)fpstack; /* retaddr is below the fp regs */ + } +#endif *nb_args = pos; TRACE( ") ret=%08x\n", stack[-1] ); return entry_point->orig_func; @@ -519,39 +556,56 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne TRACE( " retval=%08x ret=%08x\n", (UINT)retval, retaddr ); } -extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const DWORD *args ); -__ASM_GLOBAL_FUNC( call_entry_point, +extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const DWORD *stack ); +__ASM_GLOBAL_FUNC( relay_call, ".arm\n\t" - "push {r4, r5, LR}\n\t" - "mov r4, r0\n\t" - "mov r5, SP\n\t" + "push {r4-r8,lr}\n\t" + "sub sp, #16\n\t" + "mov r6, r2\n\t" + "add r3, sp, #12\n\t" + "mov r7, r0\n\t" + "mov r8, r1\n\t" + "bl " __ASM_NAME("relay_trace_entry") "\n\t" + "mov ip, r0\n\t" /* entry point */ + "mov r5, sp\n\t" + "ldr r1, [sp, #12]\n\t" /* number of args */ "lsl r3, r1, #2\n\t" - "sub SP, SP, r3\n\t" - "and SP, SP, #~7\n" - "1:\tsub r3, r3, #4\n\t" + "subs r3, #16\n\t" /* first 4 args are in registers */ + "ble 2f\n\t" + "sub sp, r3\n\t" + "and sp, #~7\n" + "add r2, r6, #16\n\t" /* skip r0-r3 */ + "1:\tsubs r3, r3, #4\n\t" "ldr r0, [r2, r3]\n\t" - "str r0, [SP, r3]\n\t" - "cmp r3, #0\n\t" - "bgt 1b\n\t" - "cmp r1, #0\n\t" - "beq 3f\n\t" - "cmp r1, #2\n\t" - "bgt 2f\n\t" - "pop {r0-r1}\n\t" - "b 3f\n" - "2:\tpop {r0-r3}\n" - "3:\tblx r4\n\t" - "mov SP, r5\n\t" - "pop {r4, r5, PC}" ) - -static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const DWORD *stack ) -{ - unsigned int nb_args; - void *func = relay_trace_entry( descr, idx, stack, &nb_args ); - LONGLONG ret = call_entry_point( func, nb_args, stack ); - relay_trace_exit( descr, idx, stack[-1], ret ); - return ret; -} + "str r0, [sp, r3]\n\t" + "bgt 1b\n" + "2:\t" +#ifndef __SOFTFP__ + "tst r1, #0x80000000\n\t" + "ldm r6, {r0-r3}\n\t" + "vldmdbne r6!, {s0-s15}\n\t" +#else + "ldm r6, {r0-r3}\n\t" +#endif + "blx ip\n\t" + "mov sp, r5\n\t" + "ldr r2, [r6, #-4]\n\t" /* retaddr */ + "mov r4, r0\n\t" + "mov r5, r1\n\t" + "mov r0, r7\n\t" + "mov r1, r8\n\t" + "strd r4, [sp]\n\t" +#ifndef __SOFTFP__ + "vstr d0, [sp, #8]\n\t" /* preserve floating point retval */ + "bl " __ASM_NAME("relay_trace_exit") "\n\t" + "vldr d0, [sp, #8]\n\t" +#else + "bl " __ASM_NAME("relay_trace_exit") "\n\t" +#endif + "mov r0, r4\n\t" + "mov r1, r5\n\t" + "add sp, #16\n\t" + "pop {r4-r8,pc}" ) #elif defined(__aarch64__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index d028726..3552eca 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -255,16 +255,16 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_ARM: { unsigned int mask, val, count = 0; - unsigned int stack_size = min( 16, (get_args_size( odp ) + 7) & ~7 ); + int j, has_float = 0; + + if (strcmp( float_abi_option, "soft" )) + for (j = 0; j < odp->u.func.nb_args && !has_float; j++) + has_float = is_float_arg( odp, j ); val = (odp->u.func.args_str_offset << 16) | (i - spec->base); - switch (stack_size) - { - case 16: output( "\tpush {r0-r3}\n" ); break; - case 8: output( "\tpush {r0-r1}\n" ); break; - case 0: break; - } + output( "\tpush {r0-r3}\n" ); output( "\tmov r2, SP\n"); + if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); for (mask = 0xff; mask; mask <<= 8) @@ -275,7 +275,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tldr IP, [r0, #4]\n"); output( "1:\tblx IP\n"); output( "\tldr IP, [SP, #4]\n" ); - output( "\tadd SP, #%u\n", stack_size + 8 ); + output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); output( "2:\t.long .L__wine_spec_relay_descr-1b\n" ); break;

1 0