wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Hans Leidekker : webservices/tests: Register an exception with the firewall to avoid a dialog.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 1ca988d4f4b0ced9ef15b130da0172d45a1ee42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca988d4f4b0ced9ef15b130d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 18 10:31:11 2017 +0100 webservices/tests: Register an exception with the firewall to avoid a dialog. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/channel.c | 142 +++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index a7c93a7..63e24e6 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = webservices.dll -IMPORTS = webservices user32 rpcrt4 ws2_32 +IMPORTS = webservices oleaut32 ole32 user32 rpcrt4 ws2_32 advapi32 C_SRCS = \ channel.c \ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 206f76d..32820fe 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -17,8 +17,11 @@ */ #include <stdio.h> +#define COBJMACROS #include "windows.h" #include "webservices.h" +#include "initguid.h" +#include "netfw.h" #include "wine/test.h" static void test_WsCreateChannel(void) @@ -814,10 +817,147 @@ static HANDLE start_listener( struct listener_info *info ) return thread; } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','e','b','s','e','r','v','i','c','e','s','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(channel) { + BOOL firewall_enabled = is_firewall_enabled(); struct listener_info info; HANDLE thread; + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip( "no privileges, skipping tests to avoid firewall dialog\n" ); + return; + } + if ((hr = set_firewall( APP_ADD )) != S_OK) + { + skip( "can't authorize app in firewall %08x\n", hr ); + return; + } + } test_WsCreateChannel(); test_WsOpenChannel(); @@ -859,4 +999,6 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + + if (firewall_enabled) set_firewall( APP_REMOVE ); }

1 0

Hans Leidekker : webservices/tests: Merge the listener tests into channel.c.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 209ad4c08739880ce0e4c2dd3d559dc018154ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=209ad4c08739880ce0e4c2dd3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 18 10:31:10 2017 +0100 webservices/tests: Merge the listener tests into channel.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 - dlls/webservices/tests/channel.c | 336 +++++++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 424 ------------------------------------- 3 files changed, 336 insertions(+), 425 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=209ad4c08739880ce0e4c…

1 0

Piotr Caban : msvcrt: Correctly set rounding mode in _ftol implementation.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 22edbd849ada33e8037f6f2b7fde75b1617f3f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22edbd849ada33e8037f6f2b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 18 12:10:28 2017 +0100 msvcrt: Correctly set rounding mode in _ftol implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0627bfa..7fb4666 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -693,7 +693,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__ftol, "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ "fnstcw (%esp)\n\t" "mov (%esp), %ax\n\t" - "or $0xc, %ax\n\t" + "or $0xc00, %ax\n\t" "mov %ax, 2(%esp)\n\t" "fldcw 2(%esp)\n\t" "fistpq 4(%esp)\n\t"

1 0

Piotr Caban : msvcr71: Don't raise exception in _invalid_parameter.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 8ee96fec2b305fb57a8107c0a65fc73c58a096d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee96fec2b305fb57a8107c0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 18 10:30:08 2017 +0100 msvcr71: Don't raise exception in _invalid_parameter. Support for invalid parameter handler was added in msvcr80. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 45bc194..5693043 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -472,7 +472,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ else { ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); -#if _MSVCR_VER > 0 +#if _MSVCR_VER >= 80 RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); #endif }

1 0

Nikolay Sivov : comctl32/tests: Add Edit control tests.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 3cd2d587184a4f91f32c04af6963cf42af895ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd2d587184a4f91f32c04af6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 11:35:33 2017 +0300 comctl32/tests: Add Edit 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/edit.c | 2979 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 60 + 3 files changed, 3040 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd2d587184a4f91f32c0…

1 0

Nikolay Sivov : user32/tests: Class API tests for interaction with activation contexts.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: ea141a5ae9db43d5cbe74f31ad81c253bf7deb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea141a5ae9db43d5cbe74f31a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 13:41:12 2017 +0300 user32/tests: Class API tests for interaction with activation contexts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 6ab4cfe..88bf376 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1161,6 +1161,166 @@ static void test_IME(void) ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); } +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE create_test_actctx(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = CreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + +static void test_actctx_classes(void) +{ + static const char main_manifest[] = + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" + "<assemblyIdentity version=\"4.3.2.1\" name=\"Wine.WndClass.Test\" type=\"win32\" />" + "<file name=\"file.exe\">" + "<windowClass>MyTestClass</windowClass>" + "</file>" + "</assembly>"; + WNDCLASSA wc; + ULONG_PTR cookie; + HANDLE context; + BOOL ret; + ATOM class; + HINSTANCE hinst; + + create_manifest_file("main.manifest", main_manifest); + context = create_test_actctx("main.manifest"); + DeleteFileA("main.manifest"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = ClassTest_WndProc; + wc.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wc.lpszClassName = "MyTestClass"; + + hinst = GetModuleHandleW(0); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(!ret, "Expected failure.\n"); + + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + /* Class info is available by versioned and regular names. */ + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(ret, "Failed to get class info.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + /* Register versioned class without active context. */ + wc.lpszClassName = "4.3.2.1!MyTestClass"; + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class == 0, "Expected failure.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + /* Only versioned name is registered. */ + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); +todo_wine + ok(!ret, "Expected failure.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + /* Register regular name first, it's not considered when versioned name is registered. */ + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ReleaseActCtx(context); +} + START_TEST(class) { char **argv; @@ -1190,6 +1350,7 @@ START_TEST(class) test_builtinproc(); test_icons(); test_comctl32_classes(); + test_actctx_classes(); /* this test unregisters the Button class so it should be executed at the end */ test_instances();

1 0

Nikolay Sivov : user32/tests: Remove runtime check for GetMenuBarInfo().
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 5f327bbb864fdf7edbddc43026ff2df25a787906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f327bbb864fdf7edbddc4302… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 11:35:17 2017 +0300 user32/tests: Remove runtime check for GetMenuBarInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 79c0010..e334be1 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,15 +38,6 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); - -static void init_function_pointers(void) -{ - HMODULE hdll = GetModuleHandleA("user32"); - - pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); -} - static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2310,9 +2301,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2324,9 +2314,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2356,7 +2345,7 @@ static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, if (wParam == MSGF_MENU) { HWND hwndMenu = (HWND)lParam; MENUBARINFO mbi = { sizeof(MENUBARINFO) }; - if (pGetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) { if (mii.fState & MFS_HILITE) { @@ -2402,11 +2391,8 @@ static void test_contextmenu(void) ok(got_en_setfocus, "edit box didn't get focused\n"); ok(got_wm_capturechanged, "main window capture did not change\n"); - if (pGetMenuBarInfo) - { - p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); - SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - } + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); DestroyWindow (hwndEdit); @@ -2954,8 +2940,6 @@ START_TEST(edit) { BOOL b; - init_function_pointers(); - hinst = GetModuleHandleA(NULL); b = RegisterWindowClasses(); ok (b, "RegisterWindowClasses failed\n");

1 0

Alexandre Julliard : kernel32: Properly detect ELF binaries that are position independent executables.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 21149e63313797a1603ca496a4c876418605d495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21149e63313797a1603ca496a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 18 11:16:13 2017 +0100 kernel32: Properly detect ELF binaries that are position independent executables. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 64 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index c0d9918..d068f2a 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -310,13 +310,29 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) unsigned char magic[4]; unsigned char class; unsigned char data; - unsigned char version; - unsigned char ignored[9]; + unsigned char ignored1[10]; unsigned short type; unsigned short machine; + unsigned char ignored2[8]; + unsigned int phoff; + unsigned char ignored3[12]; + unsigned short phnum; } elf; struct { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char ignored1[10]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[12]; + unsigned __int64 phoff; + unsigned char ignored3[16]; + unsigned short phnum; + } elf64; + struct + { unsigned int magic; unsigned int cputype; unsigned int cpusubtype; @@ -335,20 +351,54 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { - if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; #ifdef WORDS_BIGENDIAN - if (header.elf.data == 1) + BOOL byteswap = (header.elf.data == 1); #else - if (header.elf.data == 2) + BOOL byteswap = (header.elf.data == 2); #endif + if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; + if (byteswap) { header.elf.type = RtlUshortByteSwap( header.elf.type ); header.elf.machine = RtlUshortByteSwap( header.elf.machine ); } switch(header.elf.type) { - case 2: info->type = BINARY_UNIX_EXE; break; - case 3: info->type = BINARY_UNIX_LIB; break; + case 2: + info->type = BINARY_UNIX_EXE; + break; + case 3: + { + LARGE_INTEGER phoff; + unsigned short phnum; + unsigned int type; + if (header.elf.class == 2) + { + phoff.QuadPart = byteswap ? RtlUlonglongByteSwap( header.elf64.phoff ) : header.elf64.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf64.phnum ) : header.elf64.phnum; + } + else + { + phoff.QuadPart = byteswap ? RtlUlongByteSwap( header.elf.phoff ) : header.elf.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf.phnum ) : header.elf.phnum; + } + while (phnum--) + { + if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return; + if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) return; + if (byteswap) type = RtlUlongByteSwap( type ); + if (type == 3) + { + info->type = BINARY_UNIX_EXE; + break; + } + phoff.QuadPart += (header.elf.class == 2) ? 56 : 32; + } + if (!info->type) info->type = BINARY_UNIX_LIB; + break; + } + default: + return; } switch(header.elf.machine) {

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 6bca4de9586d675b231266cad71974a9f77ea995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bca4de9586d675b231266cad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 17 20:10:52 2017 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 1112 +++++++++++++++++++++++++------------------------------------- 1 file changed, 446 insertions(+), 666 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bca4de9586d675b23126…

1 0

Julian Rüger : German translation for release 2.22
by Jeremy Newman 18 Dec '17

18 Dec '17

Module: website Branch: master Commit: c2a3eea28bce9a51dfde43f85cc9b593982f0860 URL: http://source.winehq.org/git/website.git/?a=commit;h=c2a3eea28bce9a51dfde43… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 15 16:12:37 2017 +0100 German translation for release 2.22 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017112401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017112401.xml b/news/de/2017112401.xml new file mode 100644 index 0000000..5a38e06 --- /dev/null +++ b/news/de/2017112401.xml @@ -0,0 +1,17 @@ +<news> +<date>24. November 2017</date> +<title>Wine 2.22 freigegeben</title> +<body> + Die Entwicklungsversion 2.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Quellauswahldialog für Scanner.</li> + <li>Verbesserte ARM64-Unterstützung.</li> + <li>Float-Audioformate mit mehr als 2 Kanälen in XAudio.</li> + <li>Korrekturen an der DLL-Injektionsunterstützung.</li> + <li>Verbesserungen an den Inputmethoden.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017