May 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : explorer: Implement IShellWindows::FindWindowSW() for non-desktop windows.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 7b56edf9a46c14eb5c6c617826509cc0a4736389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b56edf9a46c14eb5c6c6178… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 23:29:43 2020 -0500 explorer: Implement IShellWindows::FindWindowSW() for non-desktop windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 8 +++---- programs/explorer/desktop.c | 45 ++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 207733afe7..5495787561 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1064,7 +1064,7 @@ static void test_ShellWindows(void) VariantInit(&v2); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(!ret, "Got window %#x.\n", ret); ok(!disp, "Got IDispatch %p.\n", &disp); @@ -1075,15 +1075,15 @@ static void test_ShellWindows(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(ret == (LONG)(LONG_PTR)hwnd, "Expected %p, got %#x.\n", hwnd, ret); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret == (LONG)(LONG_PTR)hwnd, "Expected %p, got %#x.\n", hwnd, ret); ok(!disp, "Got IDispatch %p.\n", &disp); hr = IShellWindows_Revoke(shellwindows, cookie); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(!ret, "Got window %#x.\n", ret); ok(!disp, "Got IDispatch %p.\n", &disp); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 264a8cb810..8a8e5bc071 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1284,26 +1284,49 @@ static HRESULT WINAPI shellwindows_OnActivated(IShellWindows *iface, LONG cookie return E_NOTIMPL; } -static HRESULT WINAPI shellwindows_FindWindowSW(IShellWindows *iface, VARIANT *loc, - VARIANT *root, int class, LONG *hwnd, int options, IDispatch **disp) +static HRESULT WINAPI shellwindows_FindWindowSW(IShellWindows *iface, VARIANT *location, + VARIANT *root, int class, LONG *hwnd, int options, IDispatch **disp) { - TRACE("%s %s 0x%x %p 0x%x %p\n", debugstr_variant(loc), debugstr_variant(root), - class, hwnd, options, disp); + struct shellwindows *sw = impl_from_IShellWindows(iface); + unsigned int i; + + TRACE("iface %p, location %p, root %p, class %#x, hwnd %p, options %#x, disp %p.\n", + iface, location, root, class, hwnd, options, disp); - if (class != SWC_DESKTOP) + if (class == SWC_DESKTOP) + { + *hwnd = (LONG)(LONG_PTR)GetDesktopWindow(); + if (options & SWFO_NEEDDISPATCH) + { + *disp = (IDispatch *)&desktopshellbrowserwindow.IWebBrowser2_iface; + IDispatch_AddRef(*disp); + } + return S_OK; + } + + if (options) + FIXME("Ignoring options %#x.\n", options); + + if (V_VT(location) != (VT_ARRAY | VT_UI1)) { - WARN("only SWC_DESKTOP class supported.\n"); + FIXME("Unexpected variant type %s.\n", debugstr_vt(V_VT(location))); return E_NOTIMPL; } - *hwnd = HandleToLong(GetDesktopWindow()); - if (options & SWFO_NEEDDISPATCH) + EnterCriticalSection(&sw->cs); + + for (i = 0; i < sw->count; ++i) { - *disp = (IDispatch*)&desktopshellbrowserwindow.IWebBrowser2_iface; - IDispatch_AddRef(*disp); + if (sw->windows[i].class == class && ILIsEqual(V_ARRAY(location)->pvData, sw->windows[i].pidl)) + { + *hwnd = sw->windows[i].hwnd; + LeaveCriticalSection(&sw->cs); + return S_OK; + } } - return S_OK; + LeaveCriticalSection(&sw->cs); + return S_FALSE; } static HRESULT WINAPI shellwindows_OnCreated(IShellWindows *iface, LONG cookie, IUnknown *punk)

1 0

Zebediah Figura : explorer: Implement IShellWindows::Register() and IShellWindows::Revoke().
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: aeff6f189fd2529788456c61a0b2baedf6ee45d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeff6f189fd2529788456c61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 23:29:41 2020 -0500 explorer: Implement IShellWindows::Register() and IShellWindows::Revoke(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 15 +----- programs/explorer/desktop.c | 93 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 90 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index c1e3fbcdaf..eea505ff61 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1035,15 +1035,12 @@ static void test_ShellWindows(void) ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr); hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie); -todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); hr = IShellWindows_Register(shellwindows, (IDispatch*)shellwindows, 0, SWC_EXPLORER, &cookie); -todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); hr = IShellWindows_Register(shellwindows, (IDispatch*)shellwindows, 0, SWC_EXPLORER, &cookie); -todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); hwnd = CreateWindowExA(0, "button", "test", BS_CHECKBOX | WS_VISIBLE | WS_POPUP, @@ -1052,16 +1049,13 @@ todo_wine cookie = 0; hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_EXPLORER, &cookie); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie != 0, "got %d\n", cookie); -} + cookie2 = 0; hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_EXPLORER, &cookie2); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie2 != 0 && cookie2 != cookie, "got %d\n", cookie2); -} pidl = ILCreateFromPathA("C:\\"); V_VT(&v) = VT_ARRAY | VT_UI1; @@ -1083,7 +1077,6 @@ todo_wine { ok(!disp, "Got IDispatch %p.\n", &disp); hr = IShellWindows_Revoke(shellwindows, cookie); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); @@ -1092,20 +1085,17 @@ todo_wine ok(!disp, "Got IDispatch %p.\n", &disp); hr = IShellWindows_Revoke(shellwindows, cookie2); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IShellWindows_Revoke(shellwindows, 0); -todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); /* we can register ourselves as desktop, but FindWindowSW still returns real desktop window */ cookie = 0; hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_DESKTOP, &cookie); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie != 0, "got %d\n", cookie); -} + disp = (void*)0xdeadbeef; ret = 0xdead; VariantInit(&v); @@ -1235,7 +1225,6 @@ todo_wine ok(ret == 0, "got %d\n", ret); hr = IShellWindows_Revoke(shellwindows, cookie); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); DestroyWindow(hwnd); IShellWindows_Release(shellwindows); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index bac17dcc5f..53dcd21817 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -118,9 +118,48 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) return S_OK; } +static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + +static LONG cookie_counter; + +struct window +{ + LONG cookie, hwnd; + int class; +}; + struct shellwindows { IShellWindows IShellWindows_iface; + CRITICAL_SECTION cs; + + unsigned int count, max; + struct window *windows; }; /* This is not limited to desktop itself, every file browser window that @@ -1140,10 +1179,34 @@ static HRESULT WINAPI shellwindows__NewEnum(IShellWindows *iface, IUnknown **ppu } static HRESULT WINAPI shellwindows_Register(IShellWindows *iface, - IDispatch *disp, LONG hWnd, int class, LONG *cookie) + IDispatch *disp, LONG hwnd, int class, LONG *cookie) { - FIXME("%p 0x%x 0x%x %p\n", disp, hWnd, class, cookie); - return E_NOTIMPL; + struct shellwindows *sw = impl_from_IShellWindows(iface); + struct window *window; + + TRACE("iface %p, disp %p, hwnd %#x, class %u, cookie %p.\n", iface, disp, hwnd, class, cookie); + + if (!hwnd) + return E_POINTER; + + if (disp) + FIXME("Ignoring IDispatch %p.\n", disp); + + EnterCriticalSection(&sw->cs); + + if (!array_reserve((void **)&sw->windows, &sw->max, sw->count + 1, sizeof(*sw->windows))) + { + LeaveCriticalSection(&sw->cs); + return E_OUTOFMEMORY; + } + + window = &sw->windows[sw->count++]; + window->hwnd = hwnd; + window->class = class; + *cookie = window->cookie = ++cookie_counter; + + LeaveCriticalSection(&sw->cs); + return S_OK; } static HRESULT WINAPI shellwindows_RegisterPending(IShellWindows *iface, @@ -1156,8 +1219,26 @@ static HRESULT WINAPI shellwindows_RegisterPending(IShellWindows *iface, static HRESULT WINAPI shellwindows_Revoke(IShellWindows *iface, LONG cookie) { - FIXME("0x%x\n", cookie); - return E_NOTIMPL; + struct shellwindows *sw = impl_from_IShellWindows(iface); + unsigned int i; + + TRACE("iface %p, cookie %u.\n", iface, cookie); + + EnterCriticalSection(&sw->cs); + + for (i = 0; i < sw->count; ++i) + { + if (sw->windows[i].cookie == cookie) + { + --sw->count; + memmove(&sw->windows[i], &sw->windows[i + 1], (sw->count - i) * sizeof(*sw->windows)); + LeaveCriticalSection(&sw->cs); + return S_OK; + } + } + + LeaveCriticalSection(&sw->cs); + return S_FALSE; } static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie, VARIANT *loc) @@ -2157,6 +2238,8 @@ static void shellwindows_init(void) CoInitialize(NULL); shellwindows.IShellWindows_iface.lpVtbl = &shellwindowsvtbl; + InitializeCriticalSection(&shellwindows.cs); + shellwindows.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": shellwindows.cs"); hr = CoRegisterClassObject(&CLSID_ShellWindows, (IUnknown*)&shellwindows_classfactory.IClassFactory_iface,

1 0

Emilio Cobos Álvarez : api-ms-win-crt-private-l1-1-0: Implement _o__fileno, _o__setmode, _o__wfopen.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 950dac9104fe5620520c090ecf441041a445dae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950dac9104fe5620520c090e… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Fri May 15 19:48:27 2020 +0200 api-ms-win-crt-private-l1-1-0: Implement _o__fileno, _o__setmode, _o__wfopen. Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 8d6ff5e89f..8e00661c8c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -270,7 +270,7 @@ @ stub _o__fgetwchar @ stub _o__filelength @ stub _o__filelengthi64 -@ stub _o__fileno +@ cdecl _o__fileno(ptr) ucrtbase._o__fileno @ stub _o__findclose @ stub _o__findfirst32 @ stub _o__findfirst32i64 @@ -673,7 +673,7 @@ @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp -@ stub _o__setmode +@ cdecl _o__setmode(long long) ucrtbase._o__setmode @ stub _o__setsystime @ stub _o__sleep @ stub _o__sopen @@ -832,7 +832,7 @@ @ stub _o__wfindnext32i64 @ stub _o__wfindnext64 @ stub _o__wfindnext64i32 -@ stub _o__wfopen +@ cdecl _o__wfopen(wstr wstr) ucrtbase._o__wfopen @ stub _o__wfopen_s @ stub _o__wfreopen @ stub _o__wfreopen_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d7c0700696..2d77c74274 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -934,7 +934,7 @@ @ stub _o__fgetwchar @ stub _o__filelength @ stub _o__filelengthi64 -@ stub _o__fileno +@ cdecl _o__fileno(ptr) MSVCRT__fileno @ stub _o__findclose @ stub _o__findfirst32 @ stub _o__findfirst32i64 @@ -1337,7 +1337,7 @@ @ stub _o__set_thread_local_invalid_parameter_handler @ stub _o__seterrormode @ stub _o__setmbcp -@ stub _o__setmode +@ cdecl _o__setmode(long long) MSVCRT__setmode @ stub _o__setsystime @ stub _o__sleep @ stub _o__sopen @@ -1496,7 +1496,7 @@ @ stub _o__wfindnext32i64 @ stub _o__wfindnext64 @ stub _o__wfindnext64i32 -@ stub _o__wfopen +@ cdecl _o__wfopen(wstr wstr) MSVCRT__wfopen @ stub _o__wfopen_s @ stub _o__wfreopen @ stub _o__wfreopen_s

1 0

Zebediah Figura : shell32/tests: Add more tests for IShellWindows.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 58e5525adeb901b6f536a1b857f75b977a9d2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58e5525adeb901b6f536a1b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 23:29:40 2020 -0500 shell32/tests: Add more tests for IShellWindows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index e9948ae630..c1e3fbcdaf 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1018,6 +1018,7 @@ static void test_ShellWindows(void) { IShellWindows *shellwindows; LONG cookie, cookie2, ret; + ITEMIDLIST *pidl; IDispatch *disp; VARIANT v, v2; HRESULT hr; @@ -1061,9 +1062,35 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie2 != 0 && cookie2 != cookie, "got %d\n", cookie2); } + + pidl = ILCreateFromPathA("C:\\"); + V_VT(&v) = VT_ARRAY | VT_UI1; + V_ARRAY(&v) = SafeArrayCreateVector(VT_UI1, 0, ILGetSize(pidl)); + memcpy(V_ARRAY(&v)->pvData, pidl, ILGetSize(pidl)); + + VariantInit(&v2); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!ret, "Got window %#x.\n", ret); + ok(!disp, "Got IDispatch %p.\n", &disp); + + hr = IShellWindows_OnNavigate(shellwindows, cookie, &v); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(ret == (LONG)(LONG_PTR)hwnd, "Expected %p, got %#x.\n", hwnd, ret); + ok(!disp, "Got IDispatch %p.\n", &disp); + hr = IShellWindows_Revoke(shellwindows, cookie); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_EXPLORER, &ret, 0, &disp); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!ret, "Got window %#x.\n", ret); + ok(!disp, "Got IDispatch %p.\n", &disp); + hr = IShellWindows_Revoke(shellwindows, cookie2); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : ntdll: Do the pre-exec checks in the Unix library.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 50134cce826de71afeb1d30a366364f57ec9769a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50134cce826de71afeb1d30a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:11:28 2020 +0200 ntdll: Do the pre-exec checks in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ loader/main.c | 16 +++--- 2 files changed, 142 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8e7530c0c..73dfb7b6c7 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -26,11 +26,15 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <stdarg.h> #include <stdio.h> #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #ifdef HAVE_SYS_UTSNAME_H #include <sys/utsname.h> #endif @@ -558,6 +562,121 @@ static void apple_main_thread(void) } #endif /* __APPLE__ */ + +#ifdef __ANDROID__ + +static int pre_exec(void) +{ +#if defined(__i386__) || defined(__x86_64__) + return 1; /* we have a preloader */ +#else + return 0; /* no exec needed */ +#endif +} + +#elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) + +static void check_vmsplit( void *stack ) +{ + if (stack < (void *)0x80000000) + { + /* if the stack is below 0x80000000, assume we can safely try a munmap there */ + if (munmap( (void *)0x80000000, 1 ) == -1 && errno == EINVAL) + ERR( "Warning: memory above 0x80000000 doesn't seem to be accessible.\n" + "Wine requires a 3G/1G user/kernel memory split to work properly.\n" ); + } +} + +static void set_max_limit( int limit ) +{ + struct rlimit rlimit; + + if (!getrlimit( limit, &rlimit )) + { + rlimit.rlim_cur = rlimit.rlim_max; + setrlimit( limit, &rlimit ); + } +} + +static int pre_exec(void) +{ + int temp; + + check_vmsplit( &temp ); + set_max_limit( RLIMIT_AS ); +#ifdef __i386__ + return 1; /* we have a preloader on x86 */ +#else + return 0; +#endif +} + +#elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) + +static int pre_exec(void) +{ + return 1; /* we have a preloader on x86-64/arm64 */ +} + +#elif defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__)) + +static int pre_exec(void) +{ + return 1; /* we have a preloader */ +} + +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) + +static int pre_exec(void) +{ + struct rlimit rl; + + rl.rlim_cur = 0x02000000; + rl.rlim_max = 0x02000000; + setrlimit( RLIMIT_DATA, &rl ); + return 1; +} + +#else + +static int pre_exec(void) +{ + return 0; /* no exec needed */ +} + +#endif + + +/*********************************************************************** + * check_command_line + * + * Check if command line is one that needs to be handled specially. + */ +static void check_command_line( int argc, char *argv[] ) +{ + static const char usage[] = + "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" + " wine --help Display this help and exit\n" + " wine --version Output version information and exit"; + + if (argc <= 1) + { + fprintf( stderr, "%s\n", usage ); + exit(1); + } + if (!strcmp( argv[1], "--help" )) + { + printf( "%s\n", usage ); + exit(0); + } + if (!strcmp( argv[1], "--version" )) + { + printf( "%s\n", get_build_id() ); + exit(0); + } +} + + /*********************************************************************** * __wine_main * @@ -571,6 +690,21 @@ void __wine_main( int argc, char *argv[], char *envp[] ) HMODULE module; wine_init_argv0_path( argv[0] ); + + if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ + { + static char noexec[] = "WINELOADERNOEXEC=1"; + + putenv( noexec ); + check_command_line( argc, argv ); + if (pre_exec()) + { + wine_exec_wine_binary( NULL, argv, getenv( "WINELOADER" )); + ERR( "could not exec the wine loader\n" ); + exit(1); + } + } + __wine_main_argc = argc; __wine_main_argv = argv; __wine_main_environ = envp; diff --git a/loader/main.c b/loader/main.c index 9f9165ff93..0e6b6f66b5 100644 --- a/loader/main.c +++ b/loader/main.c @@ -279,6 +279,14 @@ int main( int argc, char *argv[] ) int i; void *handle; + if ((handle = load_ntdll( argv[0] ))) + { + void (*init_func)(int, char **, char **) = dlsym( handle, "__wine_main" ); + if (init_func) init_func( argc, argv, environ ); + fprintf( stderr, "wine: __wine_main function not found in ntdll.so\n" ); + exit(1); + } + if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ { static char noexec[] = "WINELOADERNOEXEC=1"; @@ -294,14 +302,6 @@ int main( int argc, char *argv[] ) } } - if ((handle = load_ntdll( argv[0] ))) - { - void (*init_func)(int, char **, char **) = dlsym( handle, "__wine_main" ); - if (init_func) init_func( argc, argv, environ ); - fprintf( stderr, "wine: __wine_main function not found in ntdll.so\n" ); - exit(1); - } - if (wine_main_preload_info) { for (i = 0; wine_main_preload_info[i].size; i++)

1 0

Zhiyi Zhang : shlwapi/tests: Test NULL UrlCanonicalizeA/W() parameters.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: c169263b0bb6c2ebea84ac2b3bac122948a81c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c169263b0bb6c2ebea84ac2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 18 09:52:13 2020 +0800 shlwapi/tests: Test NULL UrlCanonicalizeA/W() parameters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index d30737f60a..2e1df63201 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1052,6 +1052,22 @@ static void test_UrlCanonicalizeA(void) urllen = lstrlenA(winehqA); + /* Parameter checks */ + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeA(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeA(winehqA, NULL, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, NULL, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = 0; + hr = pUrlCanonicalizeA(winehqA, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* buffer has no space for the result */ dwSize=urllen-1; memset(szReturnUrl, '#', urllen+4); @@ -1137,6 +1153,22 @@ static void test_UrlCanonicalizeW(void) } urllen = lstrlenW(winehqW); + /* Parameter checks */ + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeW(NULL, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = ARRAY_SIZE(szReturnUrl); + hr = pUrlCanonicalizeW(winehqW, NULL, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, NULL, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + dwSize = 0; + hr = pUrlCanonicalizeW(winehqW, szReturnUrl, &dwSize, URL_UNESCAPE); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* buffer has no space for the result */ dwSize = (urllen-1); memset(szReturnUrl, '#', (urllen+4) * sizeof(WCHAR));

1 0

Alexandre Julliard : ntdll: Move the Wine version functions to the Unix library.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 9b8afa0f83f2fc576723a0262ee17f32055b25d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8afa0f83f2fc576723a026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 17 11:09:30 2020 +0200 ntdll: Move the Wine version functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 8 ++++++++ dlls/ntdll/misc.c | 24 +++--------------------- dlls/ntdll/unix/loader.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 5 +++++ tools/makedep.c | 5 ++++- 5 files changed, 68 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index f1ecb395e3..ebf607e9d4 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -59,9 +59,17 @@ C_SRCS = \ RC_SRCS = version.rc +EXTRA_OBJS = unix/version.o + server_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ -DDLLDIR=\"${dlldir}\" \ -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \ -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + +unix/version.c: dummy + version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) + +dummy: +.PHONY: dummy diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index c29a1c26c2..fd9ba49113 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -23,13 +23,9 @@ #include <time.h> #include <math.h> -#ifdef HAVE_SYS_UTSNAME_H -#include <sys/utsname.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS -#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "wmistr.h" @@ -57,7 +53,7 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) */ const char * CDECL NTDLL_wine_get_version(void) { - return wine_get_version(); + return unix_funcs->get_version(); } /********************************************************************* @@ -65,7 +61,7 @@ const char * CDECL NTDLL_wine_get_version(void) */ const char * CDECL NTDLL_wine_get_build_id(void) { - return wine_get_build_id(); + return unix_funcs->get_build_id(); } /********************************************************************* @@ -73,21 +69,7 @@ const char * CDECL NTDLL_wine_get_build_id(void) */ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **release ) { -#ifdef HAVE_SYS_UTSNAME_H - static struct utsname buf; - static BOOL init_done; - - if (!init_done) - { - uname( &buf ); - init_done = TRUE; - } - if (sysname) *sysname = buf.sysname; - if (release) *release = buf.release; -#else - if (sysname) *sysname = ""; - if (release) *release = ""; -#endif + return unix_funcs->get_host_version( sysname, release ); } /********************************************************************* diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fdcca55beb..a8e7530c0c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_UTSNAME_H +#include <sys/utsname.h> +#endif #ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # define LoadResource MacLoadResource @@ -101,6 +104,48 @@ static void fixup_so_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int d } +/********************************************************************* + * get_version + */ +const char * CDECL get_version(void) +{ + return PACKAGE_VERSION; +} + + +/********************************************************************* + * get_build_id + */ +const char * CDECL get_build_id(void) +{ + extern const char wine_build[]; + return wine_build; +} + + +/********************************************************************* + * get_host_version + */ +void CDECL get_host_version( const char **sysname, const char **release ) +{ +#ifdef HAVE_SYS_UTSNAME_H + static struct utsname buf; + static BOOL init_done; + + if (!init_done) + { + uname( &buf ); + init_done = TRUE; + } + if (sysname) *sysname = buf.sysname; + if (release) *release = buf.release; +#else + if (sysname) *sysname = ""; + if (release) *release = ""; +#endif +} + + /************************************************************************* * map_so_dll * @@ -379,6 +424,9 @@ static HMODULE load_ntdll(void) */ static struct unix_funcs unix_funcs = { + get_version, + get_build_id, + get_host_version, map_so_dll, mmap_add_reserved_area, mmap_remove_reserved_area, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 753dea6acc..62ba2615ba 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,6 +28,11 @@ struct unix_funcs { + /* environment functions */ + const char * (CDECL *get_version)(void); + const char * (CDECL *get_build_id)(void); + void (CDECL *get_host_version)( const char **sysname, const char **release ); + /* virtual memory functions */ NTSTATUS (CDECL *map_so_dll)( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ); void (CDECL *mmap_add_reserved_area)( void *addr, SIZE_T size ); diff --git a/tools/makedep.c b/tools/makedep.c index 193de2d4d8..cde07f669c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1969,7 +1969,10 @@ static void add_generated_sources( struct makefile *make ) { /* default to .c for unknown extra object files */ if (strendswith( objs.str[i], ".o" )) - add_generated_source( make, objs.str[i], replace_extension( objs.str[i], ".o", ".c" )); + { + file = add_generated_source( make, objs.str[i], replace_extension( objs.str[i], ".o", ".c" )); + if (make->module || make->staticlib) file->file->flags |= FLAG_C_UNIX; + } else if (strendswith( objs.str[i], ".res" )) add_generated_source( make, replace_extension( objs.str[i], ".res", ".rc" ), NULL ); else

1 0

Zebediah Figura : quartz/tests: Relax an intermittently failing test.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 06674113f962c12ed0a52abe8d90b57d295cf972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06674113f962c12ed0a52abe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 14:38:15 2020 -0500 quartz/tests: Relax an intermittently failing test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 08faa1ef73..b85a801f0e 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -259,18 +259,15 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, -500 * 10000, 1000 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); + hr = IReferenceClock_AdvisePeriodic(clock, current, 100 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!WaitForSingleObject(semaphore, 20), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 50), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) - { - ok(WaitForSingleObject(semaphore, 460) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - ok(!WaitForSingleObject(semaphore, 60), "Semaphore should be signaled.\n"); - } + ok(!WaitForSingleObject(semaphore, 500), "Semaphore should be signaled.\n"); hr = IReferenceClock_Unadvise(clock, cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(WaitForSingleObject(semaphore, 520) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(WaitForSingleObject(semaphore, 200) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); CloseHandle(event); CloseHandle(semaphore);

1 0

Zebediah Figura : quartz/tests: Fix a crash in test_renderless_formats().
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 6b9bc1bff5f0488af8816e7669d1f2415c31e6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b9bc1bff5f0488af8816e76… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 17 14:38:13 2020 -0500 quartz/tests: Fix a crash in test_renderless_formats(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 57e92ad714..dfa9dae73e 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2979,14 +2979,14 @@ static void test_renderless_formats(void) .pbFormat = (BYTE *)&vih, }; ALLOCATOR_PROPERTIES req_props = {5, 32 * 16 * 4, 1, 0}, ret_props; - IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); - IFilterGraph2 *graph = create_graph(); IVMRSurfaceAllocatorNotify9 *notify; RECT rect = {0, 0, 640, 480}; struct testfilter source; IDirect3DDevice9 *device; IMemAllocator *allocator; + IFilterGraph2 *graph; IMemInputPin *input; + IBaseFilter *filter; unsigned int i; HWND window; HRESULT hr; @@ -3020,13 +3020,17 @@ static void test_renderless_formats(void) {&MEDIASUBTYPE_YV12, MAKEFOURCC('Y','V','1','2'), VMR9AllocFlag_OffscreenSurface}, }; - IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); - AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); if (!(device = create_device(window))) - goto out; + { + DestroyWindow(window); + return; + } + + filter = create_vmr9(VMR9Mode_Renderless); + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) @@ -3042,6 +3046,7 @@ static void test_renderless_formats(void) allocator_notify = notify; testfilter_init(&source); + graph = create_graph(); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); IBaseFilter_FindPin(filter, L"VMR Input0", &pin);

1 0

Jacek Caban : makedep: Install also generated typelib for installed idl files.
by Alexandre Julliard May 18, 2020

May 18, 2020

Module: wine Branch: master Commit: 7a1a77b6765801b1375491602661d466ec2fee0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1a77b6765801b137549160… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 17 01:02:36 2020 +0200 makedep: Install also generated typelib for installed idl files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index cde07f669c..653c5488e1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2829,6 +2829,9 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, if (source->file->flags & FLAG_IDL_HEADER) add_install_rule( make, source->name, strmake( "%s.h", obj ), strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); + if (source->file->flags & FLAG_IDL_TYPELIB) + add_install_rule( make, source->name, strmake( "%s.tlb", obj ), + strmake( "d$(includedir)/wine/%s.tlb", get_include_install_path( obj ) )); } if (!targets.count) return;

1 0