wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Ken Thomases : wined3d: Change calls of GetDC() to GetDCEx() with DCX_CACHE so the HDC is not shared with other threads.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 52a99f2eadf04394a99d81f97a9a6d2a454fa959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a99f2eadf04394a99d81f97… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 15 14:48:27 2016 -0600 wined3d: Change calls of GetDC() to GetDCEx() with DCX_CACHE so the HDC is not shared with other threads. Windows created by the app may use the CS_CLASSDC or CS_OWNDC class styles. In that case, GetDC() would return the same HDC to all callers. It's not safe, though, for multiple threads to use the same HDC without synchronization. The app may be using that HDC from multiple threads and using some synchronization scheme to make that safe, but wined3d is not able to cooperate in such a scheme. Using GetDCEx() with DCX_CACHE ensures that wined3d gets an independent HDC. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/swapchain.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 664ef73..442516a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -790,7 +790,7 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) { if (ctx->gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HDC dc = GetDC(ctx->restore_pf_win); + HDC dc = GetDCEx(ctx->restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); if (dc) { if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf)))) @@ -966,7 +966,7 @@ static void context_update_window(struct wined3d_context *context) context->needs_set = 1; context->valid = 1; - if (!(context->hdc = GetDC(context->win_handle))) + if (!(context->hdc = GetDCEx(context->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { ERR("Failed to get a device context for window %p.\n", context->win_handle); context->valid = 0; @@ -1526,7 +1526,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - if (!(hdc = GetDC(swapchain->win_handle))) + if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2eb4750..6e56def 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -257,7 +257,7 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s if (flags) FIXME("Ignoring flags %#x.\n", flags); - dc = GetDC(swapchain->device_window); + dc = GetDCEx(swapchain->device_window, 0, DCX_USESTYLE | DCX_CACHE); SetDeviceGammaRamp(dc, (void *)ramp); ReleaseDC(swapchain->device_window, dc); @@ -277,7 +277,7 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s TRACE("swapchain %p, ramp %p.\n", swapchain, ramp); - dc = GetDC(swapchain->device_window); + dc = GetDCEx(swapchain->device_window, 0, DCX_USESTYLE | DCX_CACHE); GetDeviceGammaRamp(dc, ramp); ReleaseDC(swapchain->device_window, dc);

1 0

Qian Hong : advapi32/tests: Add invalid parameter tests for AccessCheck.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 86c4790721eb55b263127800a15e7581eceafea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c4790721eb55b263127800a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Feb 16 04:52:55 2016 +0800 advapi32/tests: Add invalid parameter tests for AccessCheck. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 881b3ec..3e1ced0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1411,6 +1411,59 @@ static void test_AccessCheck(void) GetLastError()); trace("AccessCheck with MAXIMUM_ALLOWED got Access 0x%08x\n", Access); + /* Null PrivSet with null PrivSetLen pointer */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + NULL, NULL, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + + /* Null PrivSet with valid PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + /* Access denied by SD */ SetLastError(0xdeadbeef); Access = AccessStatus = 0x1abe11ed;

1 0

Michael Müller : api-ms-win-core-threadpool-l1-2-0: Add dll.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 546f84d0337e08edb85e1d49b6ee610892d7277e URL: http://source.winehq.org/git/wine.git/?a=commit;h=546f84d0337e08edb85e1d49b… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 16 07:24:00 2016 +0100 api-ms-win-core-threadpool-l1-2-0: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-threadpool-l1-2-0.spec | 37 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 42 insertions(+) diff --git a/configure b/configure index 97b2ed7..98ff773 100755 --- a/configure +++ b/configure @@ -927,6 +927,7 @@ enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 +enable_api_ms_win_core_threadpool_l1_2_0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 @@ -17387,6 +17388,7 @@ wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_ wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 +wine_fn_config_dll api-ms-win-core-threadpool-l1-2-0 enable_api_ms_win_core_threadpool_l1_2_0 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 diff --git a/configure.ac b/configure.ac index 7223473..c9445e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2693,6 +2693,7 @@ WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) +WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in b/dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in new file mode 100644 index 0000000..fa2c09e --- /dev/null +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-threadpool-l1-2-0.dll diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec new file mode 100644 index 0000000..870becc --- /dev/null +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec @@ -0,0 +1,37 @@ +@ stdcall CallbackMayRunLong(ptr) kernel32.CallbackMayRunLong +@ stub CancelThreadpoolIo +@ stdcall CloseThreadpool(ptr) kernel32.CloseThreadpool +@ stdcall CloseThreadpoolCleanupGroup(ptr) kernel32.CloseThreadpoolCleanupGroup +@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) kernel32.CloseThreadpoolCleanupGroupMembers +@ stub CloseThreadpoolIo +@ stdcall CloseThreadpoolTimer(ptr) kernel32.CloseThreadpoolTimer +@ stdcall CloseThreadpoolWait(ptr) kernel32.CloseThreadpoolWait +@ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork +@ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool +@ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup +@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer +@ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait +@ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork +@ stdcall DisassociateCurrentThreadFromCallback(ptr) kernel32.DisassociateCurrentThreadFromCallback +@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) kernel32.FreeLibraryWhenCallbackReturns +@ stdcall IsThreadpoolTimerSet(ptr) kernel32.IsThreadpoolTimerSet +@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) kernel32.LeaveCriticalSectionWhenCallbackReturns +@ stub QueryThreadpoolStackInformation +@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns +@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns +@ stdcall SetEventWhenCallbackReturns(ptr long) kernel32.SetEventWhenCallbackReturns +@ stub SetThreadpoolStackInformation +@ stdcall SetThreadpoolThreadMaximum(ptr long) kernel32.SetThreadpoolThreadMaximum +@ stdcall SetThreadpoolThreadMinimum(ptr long) kernel32.SetThreadpoolThreadMinimum +@ stdcall SetThreadpoolTimer(ptr ptr long long) kernel32.SetThreadpoolTimer +@ stub SetThreadpoolTimerEx +@ stdcall SetThreadpoolWait(ptr long ptr) kernel32.SetThreadpoolWait +@ stub SetThreadpoolWaitEx +@ stub StartThreadpoolIo +@ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork +@ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback +@ stub WaitForThreadpoolIoCallbacks +@ stdcall WaitForThreadpoolTimerCallbacks(ptr long) kernel32.WaitForThreadpoolTimerCallbacks +@ stdcall WaitForThreadpoolWaitCallbacks(ptr long) kernel32.WaitForThreadpoolWaitCallbacks +@ stdcall WaitForThreadpoolWorkCallbacks(ptr long) kernel32.WaitForThreadpoolWorkCallbacks diff --git a/tools/make_specfiles b/tools/make_specfiles index 34db390..223af07 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -197,6 +197,7 @@ my @dll_groups = "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0", + "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-file-l2-1-1",

1 0

Michael Müller : api-ms-win-core-wow64-l1-1-0: Add dll.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: ce06d93e33dd7a6a02a43dbc49eeb69b6ba83716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce06d93e33dd7a6a02a43dbc4… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 16 07:23:42 2016 +0100 api-ms-win-core-wow64-l1-1-0: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index ceb9e5e..97b2ed7 100755 --- a/configure +++ b/configure @@ -936,6 +936,7 @@ enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_registration_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 +enable_api_ms_win_core_wow64_l1_1_0 enable_api_ms_win_core_xstate_l2_1_0 enable_api_ms_win_crt_conio_l1_1_0 enable_api_ms_win_crt_convert_l1_1_0 @@ -17395,6 +17396,7 @@ wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_win wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_core_winrt_registration_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-wow64-l1-1-0 enable_api_ms_win_core_wow64_l1_1_0 wine_fn_config_dll api-ms-win-core-xstate-l2-1-0 enable_api_ms_win_core_xstate_l2_1_0 wine_fn_config_dll api-ms-win-crt-conio-l1-1-0 enable_api_ms_win_crt_conio_l1_1_0 wine_fn_config_dll api-ms-win-crt-convert-l1-1-0 enable_api_ms_win_crt_convert_l1_1_0 diff --git a/configure.ac b/configure.ac index 8a90202..7223473 100644 --- a/configure.ac +++ b/configure.ac @@ -2702,6 +2702,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-wow64-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) WINE_CONFIG_DLL(api-ms-win-crt-convert-l1-1-0) diff --git a/dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in b/dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in new file mode 100644 index 0000000..3e3d74f --- /dev/null +++ b/dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-wow64-l1-1-0.dll diff --git a/dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec b/dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec new file mode 100644 index 0000000..c1df1cf --- /dev/null +++ b/dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection +@ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/tools/make_specfiles b/tools/make_specfiles index 97780a1..34db390 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -208,6 +208,7 @@ my @dll_groups = "api-ms-win-core-localization-l1-2-1", "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1", + "api-ms-win-core-wow64-l1-1-0", "api-ms-win-core-xstate-l2-1-0", "api-ms-win-core-errorhandling-l1-1-2", ],

1 0

Michael Müller : kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 8eb893f185414278dc45b238349c2e87a73381c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb893f185414278dc45b2383… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 16 06:53:14 2016 +0100 kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 03ef38c..4bfc6cc 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -235,7 +235,13 @@ BOOL WINAPI VirtualProtect( LPVOID addr, SIZE_T size, DWORD new_prot, LPDWORD ol BOOL WINAPI VirtualProtectEx( HANDLE process, LPVOID addr, SIZE_T size, DWORD new_prot, LPDWORD old_prot ) { - NTSTATUS status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); + NTSTATUS status; + DWORD prot; + + /* Win9x allows to pass NULL as old_prot while it fails on NT */ + if (!old_prot && (GetVersion() & 0x80000000)) old_prot = &prot; + + status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; }

1 0

Charles Davis : libwine: Define some functions only on i386 (Clang).
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: b5f210ddc96f59938a805f1d0a76110b1323f5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f210ddc96f59938a805f1d0… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 02:18:40 2016 -0700 libwine: Define some functions only on i386 (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index b219147..1a3ca59 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -292,6 +292,7 @@ static inline void reserve_area( void *addr, void *end ) } +#ifdef __i386__ /*********************************************************************** * reserve_malloc_space * @@ -336,6 +337,7 @@ static inline void reserve_dos_area(void) wine_anon_mmap( NULL, first_page, PROT_NONE, MAP_NORESERVE|MAP_FIXED ); wine_mmap_add_reserved_area( NULL, dos_area_size ); } +#endif /***********************************************************************

1 0

Jactry Zeng : riched32/tests: Simplify tests with todo_wine_if.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 3beb0060633e08d26e2692123dbc10be31ccf895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beb0060633e08d26e2692123… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 16 16:24:17 2016 +0800 riched32/tests: Simplify tests with todo_wine_if. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index c299348..6fe4005 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -527,12 +527,9 @@ static void test_EM_LINELENGTH(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); - if (offset_test1[i][2]) - todo_wine ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", - offset_test1[i][0], result, offset_test1[i][1]); - else - ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", - offset_test1[i][0], result, offset_test1[i][1]); + todo_wine_if (offset_test1[i][2]) + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); } } @@ -1309,20 +1306,15 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id cr.cpMax = setsel->max; result = SendMessageA(hwnd, EM_EXSETSEL, 0, (LPARAM)&cr); - if (setsel->result_todo) - todo_wine ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); - else + todo_wine_if (setsel->result_todo) ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->sel_todo) { - todo_wine { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } - } else { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } + todo_wine_if (setsel->sel_todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, + "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } static void test_EM_EXSETSEL(void) @@ -1370,20 +1362,15 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); - if (setsel->result_todo) - todo_wine ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); - else + todo_wine_if (setsel->result_todo) ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->sel_todo) { - todo_wine { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } - } else { - ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); - } + todo_wine_if (setsel->sel_todo) + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, + "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", + id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } static void test_EM_SETSEL(void)

1 0

Jactry Zeng : mlang/tests: Simplify test with todo_wine_if.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 25d999d965a9f3eff6391134714e84b9c3af30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d999d965a9f3eff63911347… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 16 16:22:17 2016 +0800 mlang/tests: Simplify test with todo_wine_if. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0078f6e..14da21e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1216,8 +1216,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) short_broken_name[MAX_LOCALE_NAME - 2] = 0; } - if (info_table[i].todo & TODO_NAME) { - todo_wine + todo_wine_if (info_table[i].todo & TODO_NAME) { ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || (info_table[i].broken_name && ( broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ @@ -1225,14 +1224,6 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) "#%02d: got %s (expected %s)\n", i, wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); } - else - ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - (info_table[i].broken_name && ( - broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ - broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)))), - "#%02d: got %s (expected %s)\n", i, - wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); - } /* SUBLANG_NEUTRAL only allowed for English, Arabic, Chinese */

1 0

Sebastian Lackner : ntdll/tests: Add tests for RtlInitializeCriticalSectionEx.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 2689b7b1be096c8b7755ac3e75d2d366cb3debab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2689b7b1be096c8b7755ac3e7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 08:41:21 2016 +0100 ntdll/tests: Add tests for RtlInitializeCriticalSectionEx. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 94a22ac..1b17a7e 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -98,6 +98,7 @@ static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const U static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); +static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -151,6 +152,7 @@ static void InitFunctionPtrs(void) pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); + pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2056,6 +2058,39 @@ static void test_RtlIsCriticalSectionLocked(void) DeleteCriticalSection(&info.crit); } +static void test_RtlInitializeCriticalSectionEx(void) +{ + static const CRITICAL_SECTION_DEBUG *no_debug = (void *)~(ULONG_PTR)0; + CRITICAL_SECTION cs; + + if (!pRtlInitializeCriticalSectionEx) + { + win_skip("RtlInitializeCriticalSectionEx is not available\n"); + return; + } + + memset(&cs, 0x11, sizeof(cs)); + pRtlInitializeCriticalSectionEx(&cs, 0, 0); + ok((cs.DebugInfo != NULL && cs.DebugInfo != no_debug) || broken(cs.DebugInfo == no_debug) /* >= Win 8 */, + "expected DebugInfo != NULL and DebugInfo != ~0, got %p\n", cs.DebugInfo); + ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); + ok(cs.LockSemaphore == 0, "expected LockSemaphore == 0, got %p\n", cs.LockSemaphore); + ok(cs.SpinCount == 0, "expected SpinCount == 0, got %ld\n", cs.SpinCount); + RtlDeleteCriticalSection(&cs); + + memset(&cs, 0x11, sizeof(cs)); + pRtlInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO); + todo_wine + ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); + ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); + ok(cs.LockSemaphore == 0, "expected LockSemaphore == 0, got %p\n", cs.LockSemaphore); + ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, + "expected SpinCount == 0, got %ld\n", cs.SpinCount); + RtlDeleteCriticalSection(&cs); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2086,4 +2121,5 @@ START_TEST(rtl) test_RtlGetCompressionWorkSpaceSize(); test_RtlDecompressBuffer(); test_RtlIsCriticalSectionLocked(); + test_RtlInitializeCriticalSectionEx(); }

1 0

Alexandre Julliard : makefiles: Generate dependencies for import libraries.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 364165a671c2a782d06b437e8b965cb905da1517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364165a671c2a782d06b437e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 16:53:59 2016 +0900 makefiles: Generate dependencies for import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e514cb3..9fd704b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -173,6 +173,7 @@ struct makefile const char *testdll; const char *sharedlib; const char *staticlib; + const char *staticimplib; const char *importlib; int use_msvcrt; int is_win16; @@ -1800,6 +1801,11 @@ static void add_generated_sources( struct makefile *make ) source->files_count = source->files_size = 0; source->files = NULL; } + if (source->file->flags & FLAG_C_IMPLIB) + { + if (!make->staticimplib && make->importlib && *dll_ext) + make->staticimplib = strmake( "lib%s.def.a", make->importlib ); + } } if (make->testdll) { @@ -1886,6 +1892,51 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons /******************************************************************* + * add_import_libs + */ +static struct strarray add_import_libs( const struct makefile *make, struct strarray *deps, + struct strarray imports, int cross ) +{ + struct strarray ret = empty_strarray; + unsigned int i, j; + + for (i = 0; i < imports.count; i++) + { + const char *name = imports.str[i]; + + for (j = 0; j < top_makefile->subdirs.count; j++) + { + const struct makefile *submake = top_makefile->submakes[j]; + + if (submake->importlib && !strcmp( submake->importlib, name )) + { + const char *dir = top_obj_dir_path( make, submake->base_dir ); + const char *ext = cross ? "cross.a" : *dll_ext ? "def" : "a"; + + strarray_add( deps, strmake( "%s/lib%s.%s", dir, name, ext )); + if (!cross && submake->staticimplib) + strarray_add( deps, strmake( "%s/%s", dir, submake->staticimplib )); + break; + } + + if (submake->staticlib && + !strncmp( submake->staticlib, "lib", 3 ) && + !strncmp( submake->staticlib + 3, name, strlen(name) ) && + !strcmp( submake->staticlib + 3 + strlen(name), ".a" )) + { + const char *dir = top_obj_dir_path( make, submake->base_dir ); + + strarray_add( deps, strmake( "%s/lib%s.a", dir, name )); + break; + } + } + strarray_add( &ret, strmake( "-l%s", name )); + } + return ret; +} + + +/******************************************************************* * add_install_rule */ static void add_install_rule( const struct makefile *make, struct strarray *install_rules, @@ -2417,15 +2468,14 @@ static struct strarray output_sources( const struct makefile *make ) if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; + struct strarray dep_libs = empty_strarray; char *module_path = obj_dir_path( make, make->module ); char *spec_file = NULL; if (!make->appmode.count) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "-l%s", make->delayimports.str[i] )); - for (i = 0; i < make->imports.count; i++) - strarray_add( &all_libs, strmake( "-l%s", make->imports.str[i] )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); strarray_add( &all_libs, "-lwine" ); @@ -2453,6 +2503,7 @@ static struct strarray output_sources( const struct makefile *make ) if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, res_files ); + output_filenames( dep_libs ); output( "\n" ); output( "\t%s -o $@", tools_path( make, "winegcc" )); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); @@ -2655,12 +2706,10 @@ static struct strarray output_sources( const struct makefile *make ) char *testmodule = replace_extension( make->testdll, ".dll", "_test.exe" ); char *stripped = replace_extension( make->testdll, ".dll", "_test-stripped.exe" ); char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); - struct strarray all_libs = empty_strarray; + struct strarray dep_libs = empty_strarray; + struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0 ); - for (i = 0; i < make->imports.count; i++) - strarray_add( &all_libs, strmake( "-l%s", make->imports.str[i] )); strarray_addall( &all_libs, libs ); - strarray_add( &all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &clean_files, strmake( "%s%s", stripped, dll_ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), dll_ext ); @@ -2692,6 +2741,7 @@ static struct strarray output_sources( const struct makefile *make ) obj_dir_path( make, stripped ), dll_ext ); output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, res_files ); + output_filenames( dep_libs ); output( "\n" ); output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); @@ -2704,11 +2754,15 @@ static struct strarray output_sources( const struct makefile *make ) { char *crosstest = replace_extension( make->testdll, ".dll", "_crosstest.exe" ); + dep_libs = empty_strarray; + all_libs = add_import_libs( make, &dep_libs, make->imports, 1 ); + strarray_addall( &all_libs, libs ); strarray_add( &clean_files, crosstest ); output( "%s: %s\n", obj_dir_path( make, "crosstest" ), obj_dir_path( make, crosstest )); output( "%s:", obj_dir_path( make, crosstest )); output_filenames_obj_dir( make, crossobj_files ); output_filenames_obj_dir( make, res_files ); + output_filenames( dep_libs ); output( "\n" ); output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" )));

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
76
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 February 2016