April 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : cmd: Fix sharing permissions of piped output files.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 181452b5c924dfc366eeb84cb9727f3d7afc6655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181452b5c924dfc366eeb84cb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 7 08:01:38 2016 +0100 cmd: Fix sharing permissions of piped output files. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c634f34aae0d35d3fe9a687abd86e8c0832b7d17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 811ba9f..7543b53 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1207,7 +1207,7 @@ passed --- a batch file can delete itself file correctly deleted --- a batch file can alter itself -(a)todo_wine@bar +bar ---------- Testing copy Passed: Found expected dummy.file Passed: Found expected dir1\file1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bf988f5..de92e0a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1364,7 +1364,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, if (cmdList && (*cmdList)->pipeFile[0] != 0x00) { WINE_TRACE("Input coming from %s\n", wine_dbgstr_w((*cmdList)->pipeFile)); h = CreateFileW((*cmdList)->pipeFile, GENERIC_READ, - FILE_SHARE_READ, &sa, OPEN_EXISTING, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); @@ -1425,8 +1425,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } else { WCHAR *param = WCMD_parameter(p, 0, NULL, FALSE, FALSE); - h = CreateFileW(param, GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, + &sa, creationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); heap_free(cmd);

1 0

Michael Müller : user32: Preserve beginning of extra data for MDI windows.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 59055be4562a15df4f898b49285c2a31acc10123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59055be4562a15df4f898b492… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 26 07:24:51 2016 +0100 user32: Preserve beginning of extra data for MDI windows. 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> (cherry picked from commit 3c888a74c5c5811c46f09fc9a598fad722e9727b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/mdi.c | 1 + dlls/user32/tests/msg.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b5a0473..b360528 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,6 +127,7 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ + LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 969b1af..58e1437 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3377,6 +3377,7 @@ static void test_mdi_messages(void) BOOL zoomed; RECT rc; HMENU hMenu = CreateMenu(); + LONG val; if (!mdi_RegisterWindowClasses()) assert(0); @@ -3405,8 +3406,9 @@ static void test_mdi_messages(void) rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); assert(mdi_client); - ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); + SetWindowLongA(mdi_client, 0, 0xdeadbeef); + ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); @@ -3864,6 +3866,8 @@ static void test_mdi_messages(void) SetFocus(0); flush_sequence(); + val = GetWindowLongA(mdi_client, 0); + ok(val == 0xdeadbeef || broken(val == 0) /* >= Win Vista */, "Expected 0xdeadbeef, got 0x%x\n", val); DestroyWindow(mdi_client); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);

1 0

Christopher Thielen : user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 456aa03add985f8e1ac8dfbe2ed819e39cca0656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456aa03add985f8e1ac8dfbe2… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:31:02 2016 -0800 user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85faafc0e3f3861e7c03d4f7dc842bd7d4cf6ae9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 890d154..9c52147 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -364,6 +364,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_CAPTURECHANGED: TRACE("WM_CAPTURECHANGED %p\n", hWnd); + if (hWnd == (HWND)lParam) break; state = get_button_state( hWnd ); if (state & BUTTON_BTNPRESSED) {

1 0

Sebastian Lackner : ntdll: Implement RtlInterlockedPushListSListEx and fix calling convention of RtlInterlockedPushListSList.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 349ac73f338bf6f7396d7042ed264d1aa0e62ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349ac73f338bf6f7396d7042e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:52:21 2016 +0100 ntdll: Implement RtlInterlockedPushListSListEx and fix calling convention of RtlInterlockedPushListSList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a4be1ca6db06766f6d35b0fa65afd704115e62a9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 ++- dlls/ntdll/rtl.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3b6bf0..5db37d4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -705,7 +705,8 @@ @ stdcall RtlInterlockedFlushSList(ptr) @ stdcall RtlInterlockedPopEntrySList(ptr) @ stdcall RtlInterlockedPushEntrySList(ptr ptr) -@ stdcall RtlInterlockedPushListSList(ptr ptr ptr long) +@ stdcall -norelay RtlInterlockedPushListSList(ptr ptr ptr long) +@ stdcall RtlInterlockedPushListSListEx(ptr ptr ptr long) # @ stub RtlInvertRangeList @ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8eb3e9f..a7babfe 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -57,6 +57,16 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; +#ifdef __i386__ +#define DEFINE_FASTCALL4_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 16, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(16)) +#endif + /* CRC polynomial 0xedb88320 */ static const DWORD CRC_table[256] = { @@ -1190,10 +1200,10 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEntrySList(PSLIST_HEADER list) } /************************************************************************* - * RtlInterlockedPushListSList [NTDLL.@] + * RtlInterlockedPushListSListEx [NTDLL.@] */ -PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, - PSLIST_ENTRY last, ULONG count) +PSLIST_ENTRY WINAPI RtlInterlockedPushListSListEx(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) { SLIST_HEADER old, new; @@ -1221,6 +1231,21 @@ PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY #endif } +/************************************************************************* + * RtlInterlockedPushListSList [NTDLL.@] + */ +#ifdef DEFINE_FASTCALL4_ENTRYPOINT +DEFINE_FASTCALL4_ENTRYPOINT(RtlInterlockedPushListSList) +PSLIST_ENTRY WINAPI __regs_RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) +#else +PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count) +#endif +{ + return RtlInterlockedPushListSListEx(list, first, last, count); +} + /****************************************************************************** * RtlGetCompressionWorkSpaceSize [NTDLL.@] */

1 0

Michael Müller : advapi32/tests: Add tests for Win8 pseudo handles.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 705c5b5762621d6952f0c3bf9d0d3db7074f9c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=705c5b5762621d6952f0c3bf9… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:23:16 2016 +0100 advapi32/tests: Add tests for Win8 pseudo handles. 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> (cherry picked from commit c937cf6ad272ce0e7d95ac8a2cd2fbd875f0d4fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/security.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c71e6fe..4bc3c02 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6070,6 +6070,57 @@ static void test_GetSidIdentifierAuthority(void) ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); } +static void test_pseudo_tokens(void) +{ + TOKEN_STATISTICS statistics1, statistics2; + HANDLE token; + DWORD retlen; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + memset(&statistics1, 0x11, sizeof(statistics1)); + ret = GetTokenInformation(token, TokenStatistics, &statistics1, sizeof(statistics1), &retlen); + ok(ret, "GetTokenInformation failed with %u\n", GetLastError()); + CloseHandle(token); + + /* test GetCurrentProcessToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentProcessToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentProcessToken not supported, skipping test\n"); + + /* test GetCurrentThreadEffectiveToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentThreadEffectiveToken not supported, skipping test\n"); + + SetLastError(0xdeadbeef); + ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); + ok(!ret, "OpenThreadToken should have failed\n"); + ok(GetLastError() == ERROR_NO_TOKEN, "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); + + /* test GetCurrentThreadToken() */ + SetLastError(0xdeadbeef); + ret = GetTokenInformation(GetCurrentThreadToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + todo_wine ok(GetLastError() == ERROR_NO_TOKEN || broken(GetLastError() == ERROR_INVALID_HANDLE), + "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -6115,4 +6166,5 @@ START_TEST(security) test_AddAce(); test_system_security_access(); test_GetSidIdentifierAuthority(); + test_pseudo_tokens(); }

1 0

Michael Müller : server: Add support for Win8 pseudo handles.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 69cc445c27e597728ff1e39944d5c7da96ccbc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cc445c27e597728ff1e3994… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:45 2016 +0100 server: Add support for Win8 pseudo handles. 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> (cherry picked from commit 18a8636ebee7c02d1a777eaf2ce287d92607a145) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/handle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/handle.c b/server/handle.c index 5043ff7..79bb5f6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -402,6 +402,12 @@ static inline struct object *get_magic_handle( obj_handle_t handle ) { switch(handle) { + case 0xfffffffa: /* current thread impersonation token pseudo-handle */ + return (struct object *)thread_get_impersonation_token( current ); + case 0xfffffffb: /* current thread token pseudo-handle */ + return (struct object *)current->token; + case 0xfffffffc: /* current process token pseudo-handle */ + return (struct object *)current->process->token; case 0xfffffffe: /* current thread pseudo-handle */ return &current->obj; case 0x7fffffff: /* current process pseudo-handle */

1 0

Sebastian Lackner : vcomp/tests: Reenable architecture dependent tests.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: af6f9a3c5458e290fd2b732864e131350dc4e154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6f9a3c5458e290fd2b73286… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:46:45 2016 +0100 vcomp/tests: Reenable architecture dependent tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a77e14714e495ecc63654374d53585a227b4c67f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4f030d3..914b55f 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1406,13 +1406,15 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, +#endif }; struct { @@ -1424,8 +1426,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, +#endif }; int i;

1 0

Miklós Máté : wined3d: Warn only once about unsupported wrap state.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 73909356d76d72d09472a6bacb17f1e4b62be07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73909356d76d72d09472a6bac… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Mon Mar 14 13:40:57 2016 +0100 wined3d: Warn only once about unsupported wrap state. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e29aaca0185c71461ebd708c542a0e1afdef7201) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91d6417..eab21d5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1571,7 +1571,9 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta static void state_wrap(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3D_RS_WRAP0] + static unsigned int once; + + if ((state->render_states[WINED3D_RS_WRAP0] || state->render_states[WINED3D_RS_WRAP1] || state->render_states[WINED3D_RS_WRAP2] || state->render_states[WINED3D_RS_WRAP3] @@ -1587,6 +1589,7 @@ static void state_wrap(struct wined3d_context *context, const struct wined3d_sta || state->render_states[WINED3D_RS_WRAP13] || state->render_states[WINED3D_RS_WRAP14] || state->render_states[WINED3D_RS_WRAP15]) + && !once++) FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); }

1 0

Nikolay Sivov : include: Fix IsBad* prototypes.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: dbab6979a9fad2df502f69205727b79965188660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbab6979a9fad2df502f69205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 11:53:31 2016 +0300 include: Fix IsBad* prototypes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd220569ddd1a43ade05a04d76f372ee6937e97e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/virtual.c | 16 ++++++++-------- include/winbase.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 4bfc6cc..cce707b 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -647,7 +647,7 @@ UINT WINAPI ResetWriteWatch( LPVOID base, SIZE_T size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; @@ -655,7 +655,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) { volatile const char *p = ptr; char dummy __attribute__((unused)); - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -689,14 +689,14 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT_PTR size ) { if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!ptr) return TRUE; __TRY { volatile char *p = ptr; - UINT count = size; + UINT_PTR count = size; while (count > system_info.PageSize) { @@ -730,7 +730,7 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has read access to entire block. */ -BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT_PTR size ) { return IsBadReadPtr( ptr, size ); } @@ -749,7 +749,7 @@ BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) * Success: TRUE. * Failure: FALSE. Process has write access to entire block. */ -BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT size ) +BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT_PTR size ) { return IsBadWritePtr( ptr, size ); } @@ -786,7 +786,7 @@ BOOL WINAPI IsBadCodePtr( FARPROC ptr ) * Success: TRUE. * Failure: FALSE. Read access to all bytes in string. */ -BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) { if (!str) return TRUE; @@ -810,7 +810,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) * * See IsBadStringPtrA. */ -BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) +BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) { if (!str) return TRUE; diff --git a/include/winbase.h b/include/winbase.h index 09b11e9..5c6f8ac 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2236,13 +2236,13 @@ WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); -WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT); -WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); +WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT_PTR); +WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT_PTR); #define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr) -WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT); +WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT_PTR); WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT);

1 0

Charles Davis : configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: cf0b579412728d93d35301cd6e664dc5d9158e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0b579412728d93d35301cd6… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:43:17 2016 -0700 configure: Check for __builtin_ms_va_list on all x86_64 platforms. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7d295d381c003eb2e43e781b818e5eaeb8a27f3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 33 +++++++++++---------------------- configure.ac | 31 +++++++++++-------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/configure b/configure index a31a3bd..584c2fe 100755 --- a/configure +++ b/configure @@ -4936,25 +4936,15 @@ fi case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - TARGETFLAGS="-m64" - - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - TARGETFLAGS="-m32" - - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -5011,11 +5001,14 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need gcc >= 4.4 to build Wine as 64-bit." "$LINENO" 5 + as_fn_error $? "You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " TARGETFLAGS="-m64" fi @@ -5048,10 +5041,6 @@ rm -f core conftest.err conftest.$ac_objext \ TARGETFLAGS="-marm" ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} ;; diff --git a/configure.ac b/configure.ac index 37ceab5..88e6b32 100644 --- a/configure.ac +++ b/configure.ac @@ -127,23 +127,15 @@ AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) - if test "x$enable_win64" = "xyes" - then - CC="$CC -m64" - CXX="$CXX -m64" - host_cpu="x86_64" - notice_platform="64-bit " - AC_SUBST(TARGETFLAGS,"-m64") - else - CC="$CC -m32" - CXX="$CXX -m32" - host_cpu="i386" - notice_platform="32-bit " - AC_SUBST(TARGETFLAGS,"-m32") - enable_win16=${enable_win16:-yes} - fi with_fontconfig=${with_fontconfig:-no} ;; + *-mingw32*|*-cygwin*) + enable_win16=${enable_win16:-no} + CFLAGS="$CFLAGS -D_WIN32" + ;; +esac + +case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then @@ -164,9 +156,12 @@ case $host in AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) + AC_MSG_ERROR([You need gcc >= 4.4 or clang >= 3.8 to build Wine as 64-bit.])]) fi + CC="$CC -m64" + CXX="$CXX -m64" host_cpu="x86_64" + notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") fi ;; @@ -179,10 +174,6 @@ case $host in CFLAGS="$CFLAGS -marm" AC_SUBST(TARGETFLAGS,"-marm") ;; - *-mingw32*|*-cygwin*) - enable_win16=${enable_win16:-no} - CFLAGS="$CFLAGS -D_WIN32" - ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;

1 0