February 2016 - Wine-commits

Julian Rüger : German translation for release 1.8.1
by Jeremy Newman 29 Feb '16

29 Feb '16

Module: website Branch: master Commit: 0bb9bbd566a537495179098e2305b39876643448 URL: http://source.winehq.org/git/website.git/?a=commit;h=0bb9bbd566a53749517909… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Feb 29 09:28:57 2016 +0100 German translation for release 1.8.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016020301.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2016020301.xml b/news/de/2016020301.xml new file mode 100644 index 0000000..2484b6e --- /dev/null +++ b/news/de/2016020301.xml @@ -0,0 +1,13 @@ +<news> +<date>3. Februar 2016</date> +<title>Wine 1.8.1 freigegeben</title> +<body> + Die Wartungsversion 1.8.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Kleinere Übersetzungsupdates.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.3
by Jeremy Newman 29 Feb '16

29 Feb '16

Module: website Branch: master Commit: be0d789eadc49dbf6209415544ed1c6d73ec0f60 URL: http://source.winehq.org/git/website.git/?a=commit;h=be0d789eadc49dbf620941… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Feb 29 09:34:12 2016 +0100 German translation for release 1.9.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016020501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016020501.xml b/news/de/2016020501.xml new file mode 100644 index 0000000..73a1cf3 --- /dev/null +++ b/news/de/2016020501.xml @@ -0,0 +1,17 @@ +<news> +<date>5. Februar 2016</date> +<title>Wine 1.9.3 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko-Engine, basierend auf Firefox 44.</li> + <li>JSON-Unterstützung in JavaScript.</li> + <li>Verbesserte Zeilenumbrüche in DirectWrite.</li> + <li>Etwas mehr Schreibunterstützung in den WebServices.</li> + <li>Noch weitere Shader-Model-4-Befehle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Huw Davies : riched20: Add handling for a few more special characters.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: da7c4f97532de8cd16fedbe918bbee272022bbb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c4f97532de8cd16fedbe91… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 29 12:06:26 2016 +0000 riched20: Add handling for a few more special characters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/reader.c | 18 ++++++++++++++++++ dlls/riched20/tests/editor.c | 26 ++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 27d0182..2e5dafd 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2544,6 +2544,12 @@ static void SpecialChar (RTF_Info *info) case rtfEnDash: RTFPutUnicodeChar (info, 0x2013); break; + case rtfEmSpace: + RTFPutUnicodeChar (info, ' '); + break; + case rtfEnSpace: + RTFPutUnicodeChar (info, ' '); + break; case rtfLQuote: RTFPutUnicodeChar (info, 0x2018); break; @@ -2556,6 +2562,18 @@ static void SpecialChar (RTF_Info *info) case rtfRDblQuote: RTFPutUnicodeChar (info, 0x201D); break; + case rtfLTRMark: + RTFPutUnicodeChar (info, 0x200E); + break; + case rtfRTLMark: + RTFPutUnicodeChar (info, 0x200F); + break; + case rtfNoWidthJoiner: + RTFPutUnicodeChar (info, 0x200D); + break; + case rtfNoWidthNonJoiner: + RTFPutUnicodeChar (info, 0x200C); + break; } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 98b31ce..18d080c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8278,6 +8278,31 @@ static void test_WM_GETTEXTLENGTH(void) DestroyWindow(hwndRichEdit); } +static void test_rtf_specials(void) +{ + const char *specials = "{\\rtf1\\emspace\\enspace\\bullet\\lquote" + "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; + const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, + 0x201d,0x200e,0x200f,0x200d,0x200c}; + HWND edit = new_richeditW( NULL ); + EDITSTREAM es; + WCHAR buf[80]; + LRESULT result; + + es.dwCookie = (DWORD_PTR)&specials; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + result = SendMessageW( edit, WM_GETTEXT, sizeof(buf)/sizeof(buf[0]), (LPARAM)buf ); + ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); + ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); + + DestroyWindow( edit ); +} + + START_TEST( editor ) { BOOL ret; @@ -8347,6 +8372,7 @@ START_TEST( editor ) test_EM_SETREADONLY(); test_EM_SETFONTSIZE(); test_alignment_style(); + test_rtf_specials(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jactry Zeng : kernel32/tests: Reset current directory of current process.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 846155f1531207a763c099defa90fc2c41135164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846155f1531207a763c099def… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Feb 27 22:24:50 2016 +0800 kernel32/tests: Reset current directory of current process. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/directory.c | 7 +++++++ dlls/kernel32/tests/file.c | 4 +++- dlls/kernel32/tests/path.c | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 9baae47..a3af052 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -157,6 +157,7 @@ static void test_GetSystemDirectoryW(void) static void test_CreateDirectoryA(void) { char tmpdir[MAX_PATH]; + WCHAR curdir[MAX_PATH]; BOOL ret; ret = CreateDirectoryA(NULL, NULL); @@ -172,6 +173,7 @@ static void test_CreateDirectoryA(void) ret = GetSystemDirectoryA(tmpdir, MAX_PATH); ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n"); + GetCurrentDirectoryW(MAX_PATH, curdir); ret = SetCurrentDirectoryA(tmpdir); ok(ret == TRUE, "could not chdir to the System directory\n"); @@ -329,6 +331,7 @@ static void test_CreateDirectoryA(void) ret = RemoveDirectoryA(tmpdir); ok(ret == TRUE, "RemoveDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError()); + SetCurrentDirectoryW(curdir); } static void test_CreateDirectoryW(void) @@ -341,6 +344,7 @@ static void test_CreateDirectoryW(void) static const WCHAR slashW[] = {'/',0}; static const WCHAR dotdotW[] = {'.','.',0}; static const WCHAR questionW[] = {'?',0}; + WCHAR curdir[MAX_PATH]; ret = CreateDirectoryW(NULL, NULL); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -358,6 +362,7 @@ static void test_CreateDirectoryW(void) ret = GetSystemDirectoryW(tmpdir, MAX_PATH); ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n"); + GetCurrentDirectoryW(MAX_PATH, curdir); ret = SetCurrentDirectoryW(tmpdir); ok(ret == TRUE, "could not chdir to the System directory ret %u err %u\n", ret, GetLastError()); @@ -413,6 +418,8 @@ static void test_CreateDirectoryW(void) ret, GetLastError()); ret = RemoveDirectoryW(tmpdir); ok(ret == FALSE, "RemoveDirectoryW should have failed\n"); + + SetCurrentDirectoryW(curdir); } static void test_RemoveDirectoryA(void) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 63c5b47..8353c21 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1222,6 +1222,7 @@ static void test_CreateFileA(void) {NULL, 0, -1, 0, FALSE} }; BY_HANDLE_FILE_INFORMATION Finfo; + WCHAR curdir[MAX_PATH]; ret = GetTempPathA(MAX_PATH, temp_path); ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); @@ -1286,6 +1287,7 @@ static void test_CreateFileA(void) ret = CreateDirectoryA(dirname, NULL); ok( ret, "Createdirectory failed, gle=%d\n", GetLastError() ); /* set current drive & directory to known location */ + GetCurrentDirectoryW( MAX_PATH, curdir); SetCurrentDirectoryA( temp_path ); i = 0; while (p[i].file) @@ -1340,7 +1342,7 @@ static void test_CreateFileA(void) } ret = RemoveDirectoryA(dirname); ok(ret, "RemoveDirectoryA: error %d\n", GetLastError()); - + SetCurrentDirectoryW(curdir); /* test opening directory as a directory */ hFile = CreateFileA( temp_path, GENERIC_READ, diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 830c93d..836d7ec 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1117,6 +1117,7 @@ static void test_GetTempPath(void) char save_TMP[MAX_PATH]; char windir[MAX_PATH]; char buf[MAX_PATH]; + WCHAR curdir[MAX_PATH]; if (!GetEnvironmentVariableA("TMP", save_TMP, sizeof(save_TMP))) save_TMP[0] = 0; @@ -1149,6 +1150,7 @@ static void test_GetTempPath(void) test_GetTempPathA(windir); test_GetTempPathW(windir); + GetCurrentDirectoryW(MAX_PATH, curdir); /* TMP=C: i.e. use current working directory of the specified drive */ GetWindowsDirectoryA(windir, sizeof(windir)); SetCurrentDirectoryA(windir); @@ -1162,6 +1164,7 @@ static void test_GetTempPath(void) test_GetTempPathW(windir); SetEnvironmentVariableA("TMP", save_TMP); + SetCurrentDirectoryW(curdir); } static void test_GetLongPathNameA(void) @@ -2116,9 +2119,11 @@ static void test_relative_path(void) char path[MAX_PATH], buf[MAX_PATH]; HANDLE file; int ret; + WCHAR curdir[MAX_PATH]; if (!pGetLongPathNameA) return; + GetCurrentDirectoryW(MAX_PATH, curdir); GetTempPathA(MAX_PATH, path); ret = SetCurrentDirectoryA(path); ok(ret, "SetCurrentDirectory error %d\n", GetLastError()); @@ -2176,6 +2181,7 @@ static void test_relative_path(void) DeleteFileA("foo\\file"); RemoveDirectoryA("foo"); RemoveDirectoryA("bar"); + SetCurrentDirectoryW(curdir); } static void test_CheckNameLegalDOS8Dot3(void)

1 0

Sebastian Lackner : oleaut32: Set DebugInfo for static CRITICAL_SECTION structure.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: f2e48c253603740cb7b0d5d81963c5c8c572181a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e48c253603740cb7b0d5d81… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 27 02:09:55 2016 +0100 oleaut32: Set DebugInfo for static CRITICAL_SECTION structure. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b31e8bc..6fbb320 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -45,6 +45,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); +static CRITICAL_SECTION cache_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cache_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } +}; +static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) @@ -1490,7 +1499,6 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static CRITICAL_SECTION csLastChars = { NULL, -1, 0, 0, 0, 0 }; static VARIANT_NUMBER_CHARS lastChars; static LCID lastLcid = -1; static DWORD lastFlags = 0; @@ -1498,14 +1506,14 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID WCHAR buff[4]; /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&csLastChars); + EnterCriticalSection(&cache_cs); /* Asking for default locale entries is very expensive: It is a registry server call. So cache one locally, as Microsoft does it too */ if(lcid == lastLcid && dwFlags == lastFlags) { memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); return; } @@ -1532,7 +1540,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID memcpy(&lastChars, lpChars, sizeof(defaultChars)); lastLcid = lcid; lastFlags = dwFlags; - LeaveCriticalSection(&csLastChars); + LeaveCriticalSection(&cache_cs); } /* Number Parsing States */

1 0

Frédéric Delanoy : advapi32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 1bccc8b027e80e467a402f811aee349d08aee1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bccc8b027e80e467a402f811… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 15:27:31 2016 +0100 advapi32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 658b356..4b3b4e9 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2665,8 +2665,8 @@ static void test_redirection(void) check_key_value( key, "Winetest", 0, ptr_size ); check_key_value( key, "Winetest", KEY_WOW64_64KEY, is_vista ? 64 : ptr_size ); dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY ); - if (ptr_size == 32) ok( dw == 32, "wrong value %u\n", dw ); - else todo_wine ok( dw == 32, "wrong value %u\n", dw ); + todo_wine_if (ptr_size != 32) + ok( dw == 32, "wrong value %u\n", dw ); RegCloseKey( key ); if (ptr_size == 32)

1 0

Charles Davis : Revert "winemac.drv: Actually make the GL context current even if no drawables were given.".
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 1eeec9513c9907439d9607c18b2ba96b1890465c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eeec9513c9907439d9607c18… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:39:07 2016 -0700 Revert "winemac.drv: Actually make the GL context current even if no drawables were given.". This reverts commits 38f579f9ba0aba49788c2ce84172ae5237929ef4 and 02416314ab6fb7238b28f0047089adfee4a52abd. No extant application uses this, nor are the wined3d maintainers interested in using it. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 15 ++++++--------- dlls/winemac.drv/opengl.c | 8 +------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index e1aca77..ec2b191 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -227,18 +227,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) { WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; - [context removeFromViews:YES]; - - if (currentContext != context) + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) { - if (context) - [context makeCurrentContext]; - else - [WineOpenGLContext clearCurrentContext]; - - if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + [WineOpenGLContext clearCurrentContext]; + if (currentContext != context) [currentContext removeFromViews:YES]; } + + if (context) + [context removeFromViews:YES]; } [pool release]; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f0c7048..ab79a82 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3057,13 +3057,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return TRUE; } - if (!draw_hdc && !read_hdc) - { - context->draw_hwnd = NULL; - context->draw_view = NULL; - context->draw_pbuffer = NULL; - } - else if ((hwnd = WindowFromDC(draw_hdc))) + if ((hwnd = WindowFromDC(draw_hdc))) { if (!(data = get_win_data(hwnd))) {

1 0

Charles Davis : configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 7d295d381c003eb2e43e781b818e5eaeb8a27f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d295d381c003eb2e43e781b8… 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> --- configure | 33 +++++++++++---------------------- configure.ac | 31 +++++++++++-------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/configure b/configure index be1e2f1..7bf9178 100755 --- a/configure +++ b/configure @@ -4965,25 +4965,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 @@ -5040,11 +5030,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 @@ -5077,10 +5070,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 e20cbe7..19abd08 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

Charles Davis : winebuild: Specify an object format to windres.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 77960ab755833f9e2eac01d3132c2206882d2698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77960ab755833f9e2eac01d31… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 29 01:49:58 2016 -0700 winebuild: Specify an object format to windres. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/res32.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index d459a5f..c59fa19 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -623,6 +623,7 @@ void output_res_o_file( DLLSPEC *spec ) { unsigned int i; char *res_file = NULL; + const char *format; int fd; struct strarray *args; @@ -681,7 +682,21 @@ void output_res_o_file( DLLSPEC *spec ) free( output_buffer ); args = find_tool( "windres", NULL ); + switch (target_cpu) + { + case CPU_x86: + format = "pe-i386"; + break; + case CPU_x86_64: + format = "pe-x86-64"; + break; + default: + format = NULL; + break; + } strarray_add( args, "-i", res_file, "-o", output_file_name, NULL ); + if (format) + strarray_add( args, "-F", format, NULL ); spawn( args ); strarray_free( args );

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_set_sub_resource_parent ().
by Alexandre Julliard 29 Feb '16

29 Feb '16

Module: wine Branch: master Commit: 5c1976c43b05c4ba8c83acd4ff53bebe3c4acfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1976c43b05c4ba8c83acd4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 11:38:21 2016 +0100 wined3d: Introduce wined3d_texture_set_sub_resource_parent(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++--- dlls/wined3d/texture.c | 16 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a5b18a2..78d3b11 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1266,7 +1266,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); + wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); if (src_impl->sub_resource_idx) @@ -1297,7 +1297,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); + wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; @@ -1314,7 +1314,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, tmp_rtv, FALSE); wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; - wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); + wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0533f99..76cdc72 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1537,6 +1537,22 @@ void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *tex return texture->sub_resources[sub_resource_idx].resource->parent; } +void CDECL wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + + TRACE("texture %p, sub_resource_idx %u, parent %p.\n", texture, sub_resource_idx, parent); + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return; + } + + texture->sub_resources[sub_resource_idx].resource->parent = parent; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c31ad7b..0d6ce42 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) +@ cdecl wined3d_texture_set_sub_resource_parent(ptr long ptr) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 44b54e0..b892102 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2458,6 +2458,8 @@ HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); +void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture, + unsigned int sub_resource_idx, void *parent); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0